summaryrefslogtreecommitdiff
path: root/tests/test_openpgp.py
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2022-09-17 12:02:20 +0200
committerMichał Górny <mgorny@gentoo.org>2022-09-17 12:02:20 +0200
commit503bac7e04330c5bd82ba3e7d9878b85d5024a94 (patch)
treea20bca595e1e280281a955e4d8cc09805203ab64 /tests/test_openpgp.py
parentb5533242200179fe2a9571417674b400cfebce22 (diff)
downloadgemato-503bac7e04330c5bd82ba3e7d9878b85d5024a94.tar.gz
Fix update w/ require_secure_hashes to require at least one hash
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'tests/test_openpgp.py')
-rw-r--r--tests/test_openpgp.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/test_openpgp.py b/tests/test_openpgp.py
index d11e0c1..7b02e0e 100644
--- a/tests/test_openpgp.py
+++ b/tests/test_openpgp.py
@@ -986,7 +986,8 @@ def test_recursive_manifest_loader_require_secure(tmp_path, privkey_env,
f.write(SIGNED_MANIFEST)
ctx = (pytest.raises(ManifestInsecureHashes)
- if insecure and sign is not False and require_secure is not False
+ if insecure is not None and sign is not False
+ and require_secure is not False
else contextlib.nullcontext())
with ctx:
m = ManifestRecursiveLoader(tmp_path / "Manifest",
@@ -1023,7 +1024,7 @@ def test_update_require_secure_cli(base_tree, caplog, hashes_arg,
if str(OpenPGPNoImplementation('install gpg')) in caplog.text:
pytest.skip('OpenPGP implementation missing')
- expected = (1 if insecure and sign != "--no-sign"
+ expected = (1 if insecure is not None and sign != "--no-sign"
and require_secure != "--no-require-secure_hashes"
else 0)
assert retval == expected