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 4

Commit review remarks

Browse source
This commit is contained in:
jeanluc 2023-09-13 12:29:25 +02:00 • committed by Pedro Algarvio
parent bad064ffc9
commit e1717bcf5a
2 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/gpg.py
View file

@ -945,7 +945,7 @@ def receive_keys(keyserver=None, keys=None, user=None, gnupghome=None):
f"Unable to add key to keychain: {result.get('text', 'No further description')}"
)
if not bool(recv_data):
if not recv_data:
ret["res"] = False
ret["message"].append(f"GPG reported failure: {recv_data.stderr}")
except AttributeError:

21
tests/pytests/functional/states/test_gpg.py
View file

@ -4,16 +4,9 @@ import subprocess
import psutil
import pytest
try:
import gnupg as gnupglib
HAS_GNUPG = True
except ImportError:
HAS_GNUPG = False
gnupglib = pytest.importorskip("gnupg", reason="Needs python-gnupg library")
pytestmark = [
pytest.mark.skipif(HAS_GNUPG is False, reason="Needs python-gnupg library"),
pytest.mark.skip_if_binaries_missing("gpg", reason="Needs gpg binary"),
]
@ -98,7 +91,7 @@ def gnupg_keyring(gpghome, keyring):
@pytest.fixture(params=["a"])
def pubkeys_present(gnupg, request):
def _pubkeys_present(gnupg, request):
pubkeys = [request.getfixturevalue(f"key_{x}_pub") for x in request.param]
fingerprints = [request.getfixturevalue(f"key_{x}_fp") for x in request.param]
gnupg.import_keys("\n".join(pubkeys))
@ -109,7 +102,7 @@ def pubkeys_present(gnupg, request):
# cleanup is taken care of by gpghome and tmp_path
@pytest.mark.usefixtures("pubkeys_present")
@pytest.mark.usefixtures("_pubkeys_present")
def test_gpg_present_no_changes(gpghome, gpg, gnupg, key_a_fp):
assert gnupg.list_keys(keys=key_a_fp)
ret = gpg.present(
@ -119,12 +112,10 @@ def test_gpg_present_no_changes(gpghome, gpg, gnupg, key_a_fp):
assert not ret.changes
@pytest.mark.skip_unless_on_linux(
reason="Complains about deleting private keys first when they are absent"
)
@pytest.mark.usefixtures("pubkeys_present")
@pytest.mark.usefixtures("_pubkeys_present")
def test_gpg_absent(gpghome, gpg, gnupg, key_a_fp):
assert gnupg.list_keys(keys=key_a_fp)
assert not gnupg.list_keys(keys=key_a_fp, secret=True)
ret = gpg.absent(key_a_fp[-16:], gnupghome=str(gpghome))
assert ret.result
assert ret.changes
@ -139,7 +130,7 @@ def test_gpg_absent_no_changes(gpghome, gpg, gnupg, key_a_fp):
assert not ret.changes
@pytest.mark.usefixtures("pubkeys_present")
@pytest.mark.usefixtures("_pubkeys_present")
def test_gpg_absent_test_mode_no_changes(gpghome, gpg, gnupg, key_a_fp):
assert gnupg.list_keys(keys=key_a_fp)
ret = gpg.absent(key_a_fp[-16:], gnupghome=str(gpghome), test=True)