Merge pull request #55671 from s0undt3ch/master

Lint fixes to master
saltstack · Dec 17, 2019 · 1488318 · 1488318
2 parents 6d83704 + 32bea32
commit 1488318
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/tests/unit/modules/test_acme.py b/tests/unit/modules/test_acme.py
@@ -13,16 +13,15 @@
 
 # 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
 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 @@ def test_cert(self):
                    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
                 '''),

diff --git a/tests/unit/states/test_acme.py b/tests/unit/states/test_acme.py
@@ -8,14 +8,13 @@
 
 # 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