Fix tests and add changelog

saltstack · Mar 23, 2021 · 9989097 · 9989097
1 parent 6972773
commit 9989097
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/changelog/59427.added b/changelog/59427.added
@@ -0,0 +1 @@
+Added "fips_mode" config option to master and minion configs.
diff --git a/tests/pytests/unit/pillar/__init__.py b/tests/pytests/unit/pillar/__init__.py
diff --git a/tests/pytests/unit/runners/__init__.py b/tests/pytests/unit/runners/__init__.py
diff --git a/tests/unit/modules/test_x509.py b/tests/unit/modules/test_x509.py
@@ -27,12 +27,6 @@
 from tests.support.mock import MagicMock, patch
 from tests.support.unit import TestCase, skipIf
 
-try:
-    import pytest
-except ImportError as import_error:
-    pytest = None
-
-
 try:
     import M2Crypto  # pylint: disable=unused-import
 
@@ -97,7 +91,6 @@
 }
 
 
-@skipIf(not bool(pytest), False)
 class X509TestCase(TestCase, LoaderModuleMockMixin):
     def setup_loader_modules(self):
         return {x509: {"__opts__": {"fips_mode": False}}}
@@ -464,7 +457,6 @@ def test_read_certificate(self):
         assert "MD5 Finger Print" in ret
 
 
-@skipIf(not bool(pytest), False)
 class X509FipsTestCase(TestCase, LoaderModuleMockMixin):
     def setup_loader_modules(self):
         return {x509: {"__opts__": {"fips_mode": True}}}

diff --git a/tests/unit/states/test_x509.py b/tests/unit/states/test_x509.py
@@ -105,7 +105,7 @@ def test_private_key_fips_mode(self):
         """
         )
         fp, name = tempfile.mkstemp()
-        with salt.utils.files.open(name, "w") as fd:
+        with salt.utils.files.fopen(name, "w") as fd:
             fd.write(test_key)
             fd.write(test_cert)
         ret = x509.private_key_managed(name)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Added "fips_mode" config option to master and minion configs.