diff options
| author | Michał Górny <mgorny@gentoo.org> | 2023-02-15 10:09:01 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2023-02-15 10:10:18 +0100 |
| commit | 9c7d8af01e301925c0f51e21c3ecc91746cbc09f (patch) | |
| tree | 84bcdcfac6d09d11ee7b6fdb303638bd5a8cc59d | |
| parent | 5e683c7b354cb98db551888d299755be0fd3721e (diff) | |
| download | gemato-9c7d8af01e301925c0f51e21c3ecc91746cbc09f.tar.gz | |
test_openpgp: Inline MANIFEST_*_SIG
Inline MANIFEST_GOOD_SIG and MANIFEST_BAD_SIG lists. They are both
being used in only one test, and they are combined there too. Add one
missing Manifest to the list.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
| -rw-r--r-- | tests/test_openpgp.py | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/tests/test_openpgp.py b/tests/test_openpgp.py index 2fe5b42..aa6d2d7 100644 --- a/tests/test_openpgp.py +++ b/tests/test_openpgp.py @@ -225,17 +225,6 @@ def strip_openpgp(text): return '\n'.join(lines[start+1:stop-start+2]) + '\n' -MANIFESTS_GOOD_SIG = [ - 'SIGNED_MANIFEST', - 'DASH_ESCAPED_SIGNED_MANIFEST', - 'SUBKEY_SIGNED_MANIFEST', -] -MANIFESTS_BAD_SIG = [ - 'MODIFIED_SIGNED_MANIFEST', - 'EXPIRED_SIGNED_MANIFEST' -] - - # workaround pyflakes' limitations _ = COMBINED_PUBLIC_KEYS _ = EXPIRED_PUBLIC_KEY @@ -256,7 +245,13 @@ _ = VALID_KEY_SUBKEY @pytest.mark.parametrize('manifest_var', - MANIFESTS_GOOD_SIG + MANIFESTS_BAD_SIG) + ["SIGNED_MANIFEST", + "DASH_ESCAPED_SIGNED_MANIFEST", + "SUBKEY_SIGNED_MANIFEST", + "MODIFIED_SIGNED_MANIFEST", + "EXPIRED_SIGNED_MANIFEST", + "TWO_SIGNATURE_MANIFEST", + ]) def test_noverify_goodish_manifest_load(manifest_var): """Test Manifest files that should succeed (OpenPGP disabled)""" m = ManifestFile() |