Merge pull request #55671 from s0undt3ch/master

Lint fixes to master
This commit is contained in:
Daniel Wozniak 2019-12-17 09:01:57 -07:00 committed by GitHub
commit 1488318382
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions

View file

@ -13,8 +13,8 @@ import os
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from tests.support.unit import TestCase
from tests.support.mock import MagicMock, patch
# Import Salt Module
import salt.modules.acme as acme
@ -22,7 +22,6 @@ import salt.utils.dictupdate
from salt.exceptions import SaltInvocationError
@skipIf(NO_MOCK, NO_MOCK_REASON)
class AcmeTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.acme
@ -161,7 +160,7 @@ class AcmeTestCase(TestCase, LoaderModuleMockMixin):
again. To non-interactively renew *all* of your certificates, run
"certbot renew"
- If you like Certbot, please consider supporting our work by:
Donating to ISRG / Let's Encrypt: https://letsencrypt.org/donate
Donating to EFF: https://eff.org/donate-le
'''),

View file

@ -8,14 +8,13 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import Salt Testing libs
from tests.support.mixins import LoaderModuleMockMixin
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
from tests.support.unit import TestCase
from tests.support.mock import MagicMock, patch
# Import Salt Module
import salt.states.acme as acme
@skipIf(NO_MOCK, NO_MOCK_REASON)
class AcmeTestCase(TestCase, LoaderModuleMockMixin):
'''
Test cases for salt.modules.acme