summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/test_openpgp.py19
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()