saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix tests and pre-commit

Browse source
This commit is contained in:
Daniel A. Wozniak 2021-09-24 22:42:01 -07:00 • committed by Gareth J. Greenaway
parent 1a6cdb8ffc
commit 81e3bb5601
4 changed files with 18 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
tests/pytests/unit/modules/state/test_state.py
View file

@ -237,30 +237,19 @@ class MockSerial:
Mock Class
"""
def __init__(self):
pass
class Serial:
@staticmethod
def load(data):
"""
Mock Serial class
Mock load method
"""
return {"A": "B"}
def __init__(self, data):
pass
@staticmethod
def load(data):
"""
Mock load method
"""
return {"A": "B"}
@staticmethod
def dump(data, data1):
"""
Mock dump method
"""
return True
@staticmethod
def dump(data, data1):
"""
Mock dump method
"""
return True
class MockTarFile:
@ -838,10 +827,10 @@ def test_check_request():
with patch("salt.modules.state.salt.payload", MockSerial):
mock = MagicMock(side_effect=[True, True, False])
with patch.object(os.path, "isfile", mock):
with patch("salt.utils.files.fopen", mock_open()):
with patch("salt.utils.files.fopen", mock_open(b"")):
assert state.check_request() == {"A": "B"}
with patch("salt.utils.files.fopen", mock_open()):
with patch("salt.utils.files.fopen", mock_open("")):
assert state.check_request("A") == "B"
assert state.check_request() == {}

2
tests/unit/cache/test_localfs.py vendored
View file

@ -138,7 +138,7 @@ class LocalFSTest(TestCase, LoaderModuleMockMixin):
tmp_dir = tempfile.mkdtemp(dir=RUNTIME_VARS.TMP)
# Use the helper function to create the cache file using localfs.store()
self._create_tmp_cache_file(tmp_dir, salt.paylaod)
self._create_tmp_cache_file(tmp_dir, salt.payload)
# Now fetch the data from the new cache key file
with patch.dict(localfs.__opts__, {"cachedir": tmp_dir}):

2
tests/unit/modules/test_data.py
View file

@ -37,7 +37,7 @@ class DataTestCase(TestCase, LoaderModuleMockMixin):
mocked_fopen.__enter__ = MagicMock(return_value=mocked_fopen)
mocked_fopen.__exit__ = MagicMock()
with patch("salt.utils.files.fopen", MagicMock(return_value=mocked_fopen)):
with patch("salt.payload.Serial.loads", MagicMock(return_value=True)):
with patch("salt.payload.loads", MagicMock(return_value=True)):
with patch.dict(data.__opts__, {"cachedir": "/"}):
self.assertTrue(data.load())

16
tests/unit/utils/test_minion.py
View file

@ -39,9 +39,7 @@ class MinionUtilTestCase(TestCase):
with patch("os.getpid", MagicMock(return_value=12345)):
with patch("salt.utils.files.fopen", mock_open(read_data=b"msgpack")):
with patch(
"salt.payload.Serial.loads", MagicMock(return_value=proc_data)
):
with patch("salt.payload.loads", MagicMock(return_value=proc_data)):
with patch(
"salt.utils.process.os_is_running", MagicMock(return_value=True)
):
@ -75,9 +73,7 @@ class MinionUtilTestCase(TestCase):
with patch("os.getpid", MagicMock(return_value=12345)):
with patch("salt.utils.files.fopen", mock_open(read_data=b"msgpack")):
with patch(
"salt.payload.Serial.loads", MagicMock(return_value=proc_data)
):
with patch("salt.payload.loads", MagicMock(return_value=proc_data)):
with patch(
"salt.utils.process.os_is_running", MagicMock(return_value=True)
):
@ -111,9 +107,7 @@ class MinionUtilTestCase(TestCase):
with patch("os.getpid", MagicMock(return_value=12345)):
with patch("salt.utils.files.fopen", mock_open(read_data=b"msgpack")):
with patch(
"salt.payload.Serial.loads", MagicMock(return_value=proc_data)
):
with patch("salt.payload.loads", MagicMock(return_value=proc_data)):
with patch(
"salt.utils.process.os_is_running", MagicMock(return_value=True)
):
@ -151,9 +145,7 @@ class MinionUtilTestCase(TestCase):
with patch("os.getpid", MagicMock(return_value=12345)):
with patch("salt.utils.files.fopen", mock_open(read_data=b"msgpack")):
with patch(
"salt.payload.Serial.loads", MagicMock(return_value=proc_data)
):
with patch("salt.payload.loads", MagicMock(return_value=proc_data)):
with patch(
"salt.utils.process.os_is_running", MagicMock(return_value=True)
):