From b2a777a359d046e4d68440bc389b59608277d436 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 27 Oct 2017 16:13:38 +0200 Subject: test_openpgp: Fix recursiveloader tests for missing OpenPGP --- tests/test_openpgp.py | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'tests/test_openpgp.py') diff --git a/tests/test_openpgp.py b/tests/test_openpgp.py index c3f61d2..c0a3a5f 100644 --- a/tests/test_openpgp.py +++ b/tests/test_openpgp.py @@ -387,11 +387,14 @@ class OpenPGPNoKeyTest(unittest.TestCase): with io.open(os.path.join(d, 'Manifest'), 'w') as f: f.write(SIGNED_MANIFEST) - self.assertRaises(gemato.exceptions.OpenPGPVerificationFailure, - gemato.recursiveloader.ManifestRecursiveLoader, - os.path.join(d, 'Manifest'), - verify_openpgp=True, - openpgp_env=self.env) + try: + self.assertRaises(gemato.exceptions.OpenPGPVerificationFailure, + gemato.recursiveloader.ManifestRecursiveLoader, + os.path.join(d, 'Manifest'), + verify_openpgp=True, + openpgp_env=self.env) + except gemato.exceptions.OpenPGPNoImplementation as e: + raise unittest.SkipTest(str(e)) finally: shutil.rmtree(d) @@ -402,11 +405,14 @@ class OpenPGPNoKeyTest(unittest.TestCase): os.path.join(d, 'Manifest.gz'), 'w') as cf: cf.write(SIGNED_MANIFEST) - self.assertRaises(gemato.exceptions.OpenPGPVerificationFailure, - gemato.recursiveloader.ManifestRecursiveLoader, - os.path.join(d, 'Manifest.gz'), - verify_openpgp=True, - openpgp_env=self.env) + try: + self.assertRaises(gemato.exceptions.OpenPGPVerificationFailure, + gemato.recursiveloader.ManifestRecursiveLoader, + os.path.join(d, 'Manifest.gz'), + verify_openpgp=True, + openpgp_env=self.env) + except gemato.exceptions.OpenPGPNoImplementation as e: + raise unittest.SkipTest(str(e)) finally: shutil.rmtree(d) -- cgit v1.2.3