From ba395d7c272fb450482bab8601999a6ac29eb2b4 Mon Sep 17 00:00:00 2001
From: jeanluc <lkubb@protonmail.com>
Date: Wed, 30 Nov 2022 21:53:17 +0100
Subject: [PATCH] Add tests for issue 63156

---
 tests/pytests/unit/states/test_gpg.py | 37 ++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/tests/pytests/unit/states/test_gpg.py b/tests/pytests/unit/states/test_gpg.py
index 9c3959a80fd..4d352d68e89 100644
--- a/tests/pytests/unit/states/test_gpg.py
+++ b/tests/pytests/unit/states/test_gpg.py
@@ -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"])