[tor-commits] [bridgedb/master] Fix skipped unittest test_crypto.test_getGPGContext_good_keyfile().

[isis at torproject.org]

commit d9e550bcd04523aa14dc40789fc51015632e7627
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Apr 23 03:15:56 2014 +0000

    Fix skipped unittest test_crypto.test_getGPGContext_good_keyfile().
---
 lib/bridgedb/test/test_crypto.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/bridgedb/test/test_crypto.py b/lib/bridgedb/test/test_crypto.py
index 983b09d..f828ef0 100644
--- a/lib/bridgedb/test/test_crypto.py
+++ b/lib/bridgedb/test/test_crypto.py
@@ -211,7 +211,7 @@ class GetGPGContextTest(unittest.TestCase):
         here          = os.getcwd()
         topDir        = here.rstrip('_trial_temp')
         self.runDir   = os.path.join(here, 'rundir')
-        self.gpgMoved = os.path.join(self.runDir, 'TESTING.subkeys.sec')
+        self.gpgMoved = os.path.join(here, 'TESTING.subkeys.sec')
         self.gpgFile  = os.path.join(topDir, 'gnupghome',
                                      'TESTING.subkeys.sec')
 
@@ -234,9 +234,7 @@ class GetGPGContextTest(unittest.TestCase):
 
     def test_getGPGContext_good_keyfile(self):
         """Test EmailServer.getGPGContext() with a good key filename."""
-        self.skip = True
-        raise unittest.SkipTest("see ticket #5264")
-
+        self.setKey(self.gpgMoved)
         ctx = crypto.getGPGContext(self.config)
         self.assertIsInstance(ctx, crypto.gpgme.Context)