Rev 6134: (jr) ensure all tests using gpg keys run self.import_keys() first (Jonathan in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6134 [merge]
revision-id: pqm at pqm.ubuntu.com-20110907144501-u1kyzotb0zll13np
parent: pqm at pqm.ubuntu.com-20110907135207-wjqgpk0qbwtvnbd4
parent: jriddell at canonical.com-20110907133104-dyflm29wt3xgt3dy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-09-07 14:45:01 +0000
message:
  (jr) ensure all tests using gpg keys run self.import_keys() first (Jonathan
   Riddell)
modified:
  bzrlib/tests/test_gpg.py       testgpg.py-20051017042228-9276cd40a784c93c
=== modified file 'bzrlib/tests/test_gpg.py'
--- a/bzrlib/tests/test_gpg.py	2011-08-04 14:39:42 +0000
+++ b/bzrlib/tests/test_gpg.py	2011-09-07 13:31:04 +0000
@@ -391,6 +391,7 @@
 
     def test_verify_invalid(self):
         self.requireFeature(features.gpgme)
+        self.import_keys()
         content = """-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
@@ -415,6 +416,7 @@
 
     def test_verify_expired_but_valid(self):
         self.requireFeature(features.gpgme)
+        self.import_keys()
         content = """-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
  
@@ -441,6 +443,7 @@
 
     def test_verify_unknown_key(self):
         self.requireFeature(features.gpgme)
+        self.import_keys()
         content = """-----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1