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

Run pyupgrade against the files modified in the merge-forward

Browse source
This commit is contained in:
Pedro Algarvio 2024-01-16 11:54:54 +00:00
parent 82e4e2b55f
commit b9e5f513dd
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
2 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/pytests/unit/crypt/test_crypt_cryptodome.py
View file

@ -35,8 +35,8 @@ pytestmark = [
@pytest.mark.slow_test @pytest.mark.slow_test
def test_gen_keys(): def test_gen_keys():
open_priv_wb = MockCall("/keydir{}keyname.pem".format(os.sep), "wb+") open_priv_wb = MockCall(f"/keydir{os.sep}keyname.pem", "wb+")
open_pub_wb = MockCall("/keydir{}keyname.pub".format(os.sep), "wb+") open_pub_wb = MockCall(f"/keydir{os.sep}keyname.pub", "wb+")
with patch.multiple( with patch.multiple(
os, os,
@ -48,7 +48,7 @@ def test_gen_keys():
"os.path.isfile", return_value=True "os.path.isfile", return_value=True
): ):
result = salt.crypt.gen_keys("/keydir", "keyname", 2048) result = salt.crypt.gen_keys("/keydir", "keyname", 2048)
assert result == "/keydir{}keyname.pem".format(os.sep), result assert result == f"/keydir{os.sep}keyname.pem", result
assert open_priv_wb not in m_open.calls assert open_priv_wb not in m_open.calls
assert open_pub_wb not in m_open.calls assert open_pub_wb not in m_open.calls

42
tests/pytests/unit/crypt/test_crypt_m2crypto.py
View file

@ -19,20 +19,22 @@ def test_gen_keys():
"M2Crypto.RSA.RSA.save_pub_key", MagicMock() "M2Crypto.RSA.RSA.save_pub_key", MagicMock()
) as save_pub: ) as save_pub:
with patch("os.path.isfile", return_value=True): with patch("os.path.isfile", return_value=True):
assert salt.crypt.gen_keys( assert (
"/keydir", "keyname", 2048 salt.crypt.gen_keys("/keydir", "keyname", 2048)
) == "/keydir{}keyname.pem".format(os.sep) == f"/keydir{os.sep}keyname.pem"
)
save_pem.assert_not_called() save_pem.assert_not_called()
save_pub.assert_not_called() save_pub.assert_not_called()
with patch("os.path.isfile", return_value=False): with patch("os.path.isfile", return_value=False):
assert salt.crypt.gen_keys( assert (
"/keydir", "keyname", 2048 salt.crypt.gen_keys("/keydir", "keyname", 2048)
) == "/keydir{}keyname.pem".format(os.sep) == f"/keydir{os.sep}keyname.pem"
save_pem.assert_called_once_with(
"/keydir{}keyname.pem".format(os.sep), cipher=None
) )
save_pub.assert_called_once_with("/keydir{}keyname.pub".format(os.sep)) save_pem.assert_called_once_with(
f"/keydir{os.sep}keyname.pem", cipher=None
)
save_pub.assert_called_once_with(f"/keydir{os.sep}keyname.pub")
@pytest.mark.slow_test @pytest.mark.slow_test
@ -44,24 +46,30 @@ def test_gen_keys_with_passphrase():
"M2Crypto.RSA.RSA.save_pub_key", MagicMock() "M2Crypto.RSA.RSA.save_pub_key", MagicMock()
) as save_pub: ) as save_pub:
with patch("os.path.isfile", return_value=True): with patch("os.path.isfile", return_value=True):
assert salt.crypt.gen_keys( assert (
"/keydir", "keyname", 2048, passphrase="password" salt.crypt.gen_keys(
) == "/keydir{}keyname.pem".format(os.sep) "/keydir", "keyname", 2048, passphrase="password"
)
== f"/keydir{os.sep}keyname.pem"
)
save_pem.assert_not_called() save_pem.assert_not_called()
save_pub.assert_not_called() save_pub.assert_not_called()
with patch("os.path.isfile", return_value=False): with patch("os.path.isfile", return_value=False):
assert salt.crypt.gen_keys( assert (
"/keydir", "keyname", 2048, passphrase="password" salt.crypt.gen_keys(
) == "/keydir{}keyname.pem".format(os.sep) "/keydir", "keyname", 2048, passphrase="password"
)
== f"/keydir{os.sep}keyname.pem"
)
callback = save_pem.call_args[1]["callback"] callback = save_pem.call_args[1]["callback"]
save_pem.assert_called_once_with( save_pem.assert_called_once_with(
"/keydir{}keyname.pem".format(os.sep), f"/keydir{os.sep}keyname.pem",
cipher="des_ede3_cbc", cipher="des_ede3_cbc",
callback=callback, callback=callback,
) )
assert callback(None) == b"password" assert callback(None) == b"password"
save_pub.assert_called_once_with("/keydir{}keyname.pub".format(os.sep)) save_pub.assert_called_once_with(f"/keydir{os.sep}keyname.pub")
def test_sign_message(): def test_sign_message():