diff options
| author | drebs <drebs@leap.se> | 2013-01-28 18:03:35 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-28 18:03:35 -0200 |
| commit | ca6a1e9faf7ceb2c6833cfb7049672e996be8a38 (patch) | |
| tree | 715cc2962b8476db165f96d3b61448140b2b8da3 /src/leap/email/smtp/tests/__init__.py | |
| parent | badc4aedb69ec94abd7d66347d94ac817c73fff6 (diff) | |
| parent | c9ed6f3d7f368e3dc4a3027517c7d63be2176296 (diff) | |
Merge branch 'feature/smtp-relay' into develop
Diffstat (limited to 'src/leap/email/smtp/tests/__init__.py')
| -rw-r--r-- | src/leap/email/smtp/tests/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/email/smtp/tests/__init__.py b/src/leap/email/smtp/tests/__init__.py index ef5fd062..022968e1 100644 --- a/src/leap/email/smtp/tests/__init__.py +++ b/src/leap/email/smtp/tests/__init__.py @@ -5,6 +5,7 @@ from leap.email.smtp.smtprelay import GPGWrapper from twisted.trial import unittest from leap.testing.basetest import BaseLeapTest + class OpenPGPTestCase(unittest.TestCase, BaseLeapTest): def setUp(self): @@ -24,7 +25,7 @@ class OpenPGPTestCase(unittest.TestCase, BaseLeapTest): os.mkdir(self.gnupg_home) self.email = 'leap@leap.se' self._gpg = GPGWrapper(gpghome=self.gnupg_home) - + self.assertEqual(self._gpg.import_keys(PUBLIC_KEY).summary(), '1 imported', "error importing public key") self.assertEqual(self._gpg.import_keys(PRIVATE_KEY).summary(), @@ -48,7 +49,6 @@ class OpenPGPTestCase(unittest.TestCase, BaseLeapTest): self.assertNotEqual(text, encrypted, "failed encrypting text") decrypted = str(self._gpg.decrypt(encrypted)) self.assertEqual(text, decrypted, "failed decrypting text") - # Key material for testing |