From 32bea3267db8db85eb0b47f2281815229ede0314 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 17 Dec 2019 09:08:32 +0000 Subject: [PATCH] `NO_MOCK*` is long gone --- tests/unit/modules/test_acme.py | 7 +++---- tests/unit/states/test_acme.py | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/unit/modules/test_acme.py b/tests/unit/modules/test_acme.py index 3400c734389c..f5ade73a2bbd 100644 --- a/tests/unit/modules/test_acme.py +++ b/tests/unit/modules/test_acme.py @@ -13,8 +13,8 @@ # 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 @@ 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 index c5deaa063ace..86644de73231 100644 --- 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