Add tests for issue 63156

This commit is contained in:
jeanluc 2022-11-30 21:53:17 +01:00 committed by Pedro Algarvio
parent e8b384afc9
commit ba395d7c27

View file

@ -73,7 +73,11 @@ def gpg_list_keys(request, keys_list):
@pytest.fixture
def gpg_trust(request):
trust = Mock(spec="salt.modules.gpg.trust_key")
trust.return_value = getattr(request, "param", {})
trust.return_value = getattr(
request,
"param",
{"res": True, "message": ["Setting ownership trust to Marginally"]},
)
with patch.dict(gpg.__salt__, {"gpg.trust_key": trust}):
yield trust
@ -81,7 +85,9 @@ def gpg_trust(request):
@pytest.fixture()
def gpg_receive(request):
recv = Mock(spec="salt.modules.gpg.receive_keys")
recv.return_value = getattr(request, "param", {})
recv.return_value = getattr(
request, "param", {"res": True, "message": ["Key new added to keychain"]}
)
with patch.dict(gpg.__salt__, {"gpg.receive_keys": recv}):
yield recv
@ -148,13 +154,6 @@ def test_gpg_present_new_key(gpg_receive, gpg_trust, expected):
@pytest.mark.usefixtures("gpg_list_keys")
@pytest.mark.parametrize(
"gpg_receive",
[
{"res": True, "message": ["Key new added to keychain"]},
],
indirect=True,
)
@pytest.mark.parametrize(
"gpg_trust,expected",
[
@ -173,6 +172,17 @@ def test_gpg_present_new_key_and_trust(gpg_receive, gpg_trust, expected):
gpg_trust.assert_called_once()
@pytest.mark.usefixtures("gpg_list_keys")
@pytest.mark.parametrize("key,trust", [("new", None), ("A", "marginally")])
def test_gpg_present_test_mode_no_changes(gpg_receive, gpg_trust, key, trust):
with patch.dict(gpg.__opts__, {"test": True}):
ret = gpg.present(key, trust=trust)
gpg_receive.assert_not_called()
gpg_trust.assert_not_called()
assert ret["result"] is None
assert bool(ret["changes"])
@pytest.mark.usefixtures("gpg_list_keys")
def test_gpg_absent_no_changes(gpg_delete):
ret = gpg.absent("nonexistent")
@ -204,3 +214,12 @@ def test_gpg_absent_delete_key(gpg_delete, expected):
assert ret["result"] == expected
assert bool(ret["changes"]) == expected
gpg_delete.assert_called_once()
@pytest.mark.usefixtures("gpg_list_keys")
def test_gpg_absent_test_mode_no_changes(gpg_delete):
with patch.dict(gpg.__opts__, {"test": True}):
ret = gpg.absent("A")
gpg_delete.assert_not_called()
assert ret["result"] is None
assert bool(ret["changes"])