Merge lp:~vila/bzr/1536566-gpgme-test-failure into lp:bzr

[Vincent Ladeuil]

Fix bzrlib.tests.test_gpg.TestVerify.test_verify_revoked_signature with recent versions of gpg.

bzrlib.tests.test_gpg.TestVerify.test_verify_revoked_signature started failing on wily.

I couldn't find the precise change in the gpg package set triggering the issue but the fix seems more precise than the existing version and as such shouldn't cause any regressions.

[Richard Wilbur (richard-wilbur)]

Good work! Thanks, Vincent!
+2

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'bzrlib/gpg.py'
--- bzrlib/gpg.py	2013-11-10 15:29:06 +0000
+++ bzrlib/gpg.py	2016-01-21 10:35:05 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005, 2011 Canonical Ltd
+# Copyright (C) 2005, 2006, 2007, 2009, 2011, 2012, 2013, 2016 Canonical Ltd
 #   Authors: Robert Collins <[e-mail]>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -322,12 +322,13 @@
                 return SIGNATURE_NOT_VALID, None
         # A signature from a revoked key gets this.
         # test_verify_revoked_signature()
-        if result[0].summary & gpgme.SIGSUM_SYS_ERROR:
+        if ((result[0].summary & gpgme.SIGSUM_SYS_ERROR
+             or result[0].status.strerror == 'Certificate revoked')):
             return SIGNATURE_NOT_VALID, None
         # Other error types such as revoked keys should (I think) be caught by
         # SIGSUM_RED so anything else means something is buggy.
-        raise errors.SignatureVerificationFailed("Unknown GnuPG key "\
-                                                 "verification result")
+        raise errors.SignatureVerificationFailed(
+            "Unknown GnuPG key verification result")
 
     def set_acceptable_keys(self, command_line_input):
         """Set the acceptable keys for verifying with this GPGStrategy.
 
=== modified file 'doc/en/release-notes/bzr-2.7.txt'
--- doc/en/release-notes/bzr-2.7.txt	2016-01-14 14:10:33 +0000
+++ doc/en/release-notes/bzr-2.7.txt	2016-01-21 10:35:05 +0000
@@ -76,6 +76,8 @@
    suite.  This can include new facilities for writing tests, fixes to 
    spurious test failures and changes to the way things should be tested.
 
+* Fix gpgme test failure starting on wily. (Vincent Ladeuil)
+     
 * Fix racy http tests (TestBadStatusServer is so simple, it exposes a race
   in python 2.7.9. This happens only when both the http server and client
   are run in the same process.). Only tests are affected.