From e1717bcf5a6575f7c2a7027e6b79c455294dffed Mon Sep 17 00:00:00 2001 From: jeanluc Date: Wed, 13 Sep 2023 12:29:25 +0200 Subject: [PATCH] Commit review remarks --- salt/modules/gpg.py | 2 +- tests/pytests/functional/states/test_gpg.py | 21 ++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/salt/modules/gpg.py b/salt/modules/gpg.py index 3694c433467..7f9a4712e37 100644 --- a/salt/modules/gpg.py +++ b/salt/modules/gpg.py @@ -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: diff --git a/tests/pytests/functional/states/test_gpg.py b/tests/pytests/functional/states/test_gpg.py index 4809f790652..684c7f215a4 100644 --- a/tests/pytests/functional/states/test_gpg.py +++ b/tests/pytests/functional/states/test_gpg.py @@ -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)