launchpad-reviewers team mailing list archive

[Guruprasad <mp+429554@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad:gnugp2-xenial-test-fixes into launchpad:master.

Commit message:
Fix the test failures caused by the changes made to migrate to gpg2

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad/+git/launchpad/+merge/429554
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad:gnugp2-xenial-test-fixes into launchpad:master.

diff --git a/lib/lp/archivepublisher/tests/archive-signing.rst b/lib/lp/archivepublisher/tests/archive-signing.rst
index 97b69c1..f93ca1a 100644
--- a/lib/lp/archivepublisher/tests/archive-signing.rst
+++ b/lib/lp/archivepublisher/tests/archive-signing.rst
@@ -358,7 +358,9 @@ printing the context the key is generated.
 
     >>> def mock_key_generator(name, logger=None):
     ...     print('Generating:', name)
-    ...     key_path = os.path.join(gpgkeysdir, 'sign.only@xxxxxxxxxxxxxxxxx')
+    ...     key_path = os.path.join(
+    ...         gpgkeysdir, 'ppa-sample@xxxxxxxxxxxxxxxxx'
+    ...     )
     ...     with open(key_path, 'rb') as f:
     ...         return gpghandler.importSecretKey(f.read())
 
@@ -377,10 +379,10 @@ named after the user, even if the default PPA name is something different.
     Generating: Launchpad PPA for Not Celso Providelo
 
     >>> print(cprov.archive.signing_key.fingerprint)
-    447DBF38C4F9C4ED752246B77D88913717B05A8F
+    0D57E99656BEFB0897606EE9A022DD1F5001B46D
 
     >>> print(named_ppa.signing_key.fingerprint)
-    447DBF38C4F9C4ED752246B77D88913717B05A8F
+    0D57E99656BEFB0897606EE9A022DD1F5001B46D
 
 Keys generated for copy archives use a different naming scheme.
 
diff --git a/lib/lp/testing/keyserver/tests/test_web.py b/lib/lp/testing/keyserver/tests/test_web.py
index 851ea73..c493f01 100644
--- a/lib/lp/testing/keyserver/tests/test_web.py
+++ b/lib/lp/testing/keyserver/tests/test_web.py
@@ -139,7 +139,6 @@ pub  1024D/DFD20543 2005-04-13 Sample Person (revoked) <sample.revoked@canoni
 <title>Results for Key 0xA419AE861E88BC9E04B9C26FBA2B9389DFD20543</title>
 ...
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
 <BLANKLINE>
 mQGiBEJdmOcRBADkNJPTBuCIefBdRAhvWyD9SSVHh8GHQWS7l9sRLEsirQkKz1yB
 ...
@@ -157,7 +156,6 @@ mQGiBEJdmOcRBADkNJPTBuCIefBdRAhvWyD9SSVHh8GHQWS7l9sRLEsirQkKz1yB
 <title>Results for Key 0xDFD20543</title>
 ...
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
 <BLANKLINE>
 mQGiBEJdmOcRBADkNJPTBuCIefBdRAhvWyD9SSVHh8GHQWS7l9sRLEsirQkKz1yB
 ...