Remove cherry-pick leftovers

openSUSE · Jan 23, 2025 · efb014e · efb014e
1 parent aaf701a
commit efb014e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1054,12 +1054,9 @@ def salt_syndic_master_factory(
     config_overrides = {
         "log_level_logfile": "quiet",
         "fips_mode": FIPS_TESTRUN,
-<<<<<<< HEAD
         "publish_signing_algorithm": (
             "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
         ),
-=======
->>>>>>> 02b147ae59 (Add a FIPS enabled test run under PhotonOS 4 to the CI process)
     }
     ext_pillar = []
     if salt.utils.platform.is_windows():
@@ -1176,12 +1173,9 @@ def salt_master_factory(
     config_overrides = {
         "log_level_logfile": "quiet",
         "fips_mode": FIPS_TESTRUN,
-<<<<<<< HEAD
         "publish_signing_algorithm": (
             "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1"
         ),
-=======
->>>>>>> 02b147ae59 (Add a FIPS enabled test run under PhotonOS 4 to the CI process)
     }
     ext_pillar = []
     if salt.utils.platform.is_windows():
@@ -1291,11 +1285,8 @@ def salt_minion_factory(salt_master_factory):
         "file_roots": salt_master_factory.config["file_roots"].copy(),
         "pillar_roots": salt_master_factory.config["pillar_roots"].copy(),
         "fips_mode": FIPS_TESTRUN,
-<<<<<<< HEAD
         "encryption_algorithm": "OAEP-SHA224" if FIPS_TESTRUN else "OAEP-SHA1",
         "signing_algorithm": "PKCS1v15-SHA224" if FIPS_TESTRUN else "PKCS1v15-SHA1",
-=======
->>>>>>> 02b147ae59 (Add a FIPS enabled test run under PhotonOS 4 to the CI process)
     }
 
     virtualenv_binary = get_virtualenv_binary_path()

diff --git a/tests/pytests/integration/minion/test_return_retries.py b/tests/pytests/integration/minion/test_return_retries.py
@@ -3,12 +3,9 @@
 import pytest
 from saltfactories.utils import random_string
 
-<<<<<<< HEAD
-=======
 import salt.utils.files
 from tests.conftest import FIPS_TESTRUN
 
->>>>>>> 63bab25e1c (Fix more FIPS tests)
 
 @pytest.fixture(scope="function")
 def salt_minion_retry(salt_master_factory, salt_minion_id):

diff --git a/tests/pytests/unit/conftest.py b/tests/pytests/unit/conftest.py
@@ -1,3 +1,4 @@
+import os
 import pytest
 
 import salt.config

diff --git a/tests/support/mock.py b/tests/support/mock.py
@@ -31,6 +31,7 @@
 ANY = mock.ANY
 DEFAULT = mock.DEFAULT
 FILTER_DIR = mock.FILTER_DIR
+AsyncMock = mock.AsyncMock
 MagicMock = mock.MagicMock
 Mock = mock.Mock
 NonCallableMagicMock = mock.NonCallableMagicMock