Fix up/add mirror update tests

system/files/pagerduty.key

@@ -1,5 +1,4 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.13 (Darwin)
 
 mQINBFMwev8BEADFbEQsBDRFBGwrJ+NNo7mAUYq8/gykWh2vnHktjGT+wPKdKOtk
 hq99Y4p+AL9fp+TT23bnsAcbYf5O7oeHRrD710jWfiE3+3d6tqvF1cputJxrH+TT
@@ -93,6 +92,32 @@ e+wthyPxn6KWC1P9QvrLBV+M5p6H0CdO6o0pv/XB8FV9qN5IQltSH8jQSZ/HpwYT
 VOAYT8FmpduWZ43OOoRk1Kj9sygUmazIRaCH/1gkzjCbN3/rEmmLgMEMR1Ki+9Vg
 Q3dhcorwOdN/vh/rhEcusFTDPhHSypF9aDRVfNFCjVBN0XhhzYhfhirdol5Z02oi
 cu9OA+4fuB+31GRaH1NtPp4MLUrZQtKrOaSAaX67APt1hydlulsX1UTDkrS/C7rw
-RiU9bhqMiXthkmmYFsCA40tGoVY39PWzZg==
+RiU9bhqMiXthkmmYFsCA40tGoVY39PWzZpkBDQRZcQxrAQgA6B8ncRynoZbjKXMy
-=C8n/
+G5NnQchwQMRhKMLDwFbszjpwLeZqbjLqYRQHgtpVMiskSC161Sw3tQRZ8LULpnEU
+yi2/PzzGyzMfLccQo8oIY9X1OrrsH4i1GJ4rKMEYfO6IIMpME3rvZo7wF1hpY/nm
+231G36Q51GxNpmTyoAo3Tp2cT325eI5gn5f+zS9wygYv7ma6RhpkUgm/Tnyr9901
+KO3arwH73ybTFoPKFjqAc0Ep3HGx7PNZy5OW3jF/PY3Q6NIbt/ciPdFmCPjiTnYe
+kQE1gvr/M2xA5wLI0hl+FP2JB3TDUN4XNBa/09Zw+B5k/s6qqUPytMcorSWNAF0E
+KtgmtwARAQABtD1QYWNrYWdlIE1haW50YWluZXIgKFBhZ2VyRHV0eSwgSW5jLikg
+PHBhY2thZ2VzQHBhZ2VyZHV0eS5jb20+iQFUBBMBCAA+FiEEk3rr1RF9RguAuz5n
+hyoy7XYgPAAFAllxDGsCGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AA
+CgkQhyoy7XYgPABJBQf/fBZvK7FiK/iDlgXNAvsDiT96Ns5ACSExRNpSpOjiPdMr
+Wpn+c9nN9o8YMTIA75Pfvz10TEQRWFEfeZjTnK5fZFJkOJOUSNL9sP5Zwh7q02+c
+1rGjM4jiSl3EdGlIVhA+w+tfDJPRBfwUaBwgDzHxV0MZ0fa3seiDorKf9vb+J5ng
+F2BndraJSN0ax03kNUfemc5CFP+cSO3Du3AXQxJCn095AFAwhQASPU9FvF6Glx3J
+5wLEY59yoHPcd/D3CiwQ+91tG0OGUIl3qSNP4aGLEVpTHiiOUBGvEVxgFN+PziGq
+M5lmBZtcZSM02E7Qj0JPAXOPVoShZWzZvv5TPHH9FLkBDQRZcQxrAQgAxC71lDfM
+odfkYhsHhlYVxU7ei067qilySq/zNTg2R2QDWRr4WiQlvMzFOSHAYTEugvm+suax
+3ALWEiDgrDruQHKOcfdfODFC2Vcrj08As5jf2REYJ7SW/vX+zao31kJR9izskmnf
+V3HRI0qZ8wMIDdi8qt7drN88Yxfk+RYkjOezM2vhrXk++25TUVvz6zRiuxm8+rzX
+C8aO68bGPZYfeGSVKMDlqFTu0KIF4YUN7C37dpvVyro4fpFS9h3+qPxWJCvOjbuY
+52g1IQ6A/qBZuo0z3ehxjB05cIE8LF3tbc1YGqP0YVnl8VJqfHyBX1FyApUg2c+U
+6yUdirzxG4culwARAQABiQE8BBgBCAAmFiEEk3rr1RF9RguAuz5nhyoy7XYgPAAF
+AllxDGsCGwwFCQPCZwAACgkQhyoy7XYgPAAl5Qf8Cez+m8dt6E40ik6+s3A+LdJh
+6T045K32+9vt9dI2oNUoRFwivHGGcxoPpJYa+oIJPzmsyzCcGFFbRwPrqmBFC9C0
+e+5oKO9GjKWWbzKxkjatE05V0o9txPXyirBvsEg9lFQzTvemYWDapgLis5tOJjlR
+tbbdEWDlt2mWBwTDBvSOdynH9Y8sNQ+3JvTKkRgHEXd2ZVs4Auso4TqLeMekshlq
+p/A/HRr5lqGx6XdNvXubjXJCXuZTsVFIw+aLFL2o71FG71WUbkI3N97QoAYrHeqj
++XThmUfH4koGz7Wv5+JSYoIS9xvS3NOs3gywC5bF+3HIzynFGB4BmiYbK8/y4A==
+=PcZr
 -----END PGP PUBLIC KEY BLOCK-----

system/t04_mirror/UpdateMirror19Test_gold

@@ -1,7 +1,7 @@
 Downloading http://packages.pagerduty.com/pdagent/deb/InRelease...
 Downloading http://packages.pagerduty.com/pdagent/deb/Release...
 Downloading http://packages.pagerduty.com/pdagent/deb/Release.gpg...
-gpgv:  RSA key ID F8253540
+gpgv:  RSA key ID 76203C00
 gpgv: Good signature from "Package Maintainer (PagerDuty, Inc.) <packages@pagerduty.com>"
 Downloading & parsing package files...
 Downloading http://packages.pagerduty.com/pdagent/deb/Packages.gz...

system/t04_mirror/UpdateMirror21Test_gold

@@ -0,0 +1,11 @@
+Downloading http://packages.pagerduty.com/pdagent/deb/InRelease...
+Downloading http://packages.pagerduty.com/pdagent/deb/Release...
+Downloading http://packages.pagerduty.com/pdagent/deb/Release.gpg...
+openpgp:  RSA key ID 872A32ED76203C00
+openpgp: Good signature from "Package Maintainer (PagerDuty, Inc.) <packages@pagerduty.com>"
+Downloading & parsing package files...
+Downloading http://packages.pagerduty.com/pdagent/deb/Packages.gz...
+Building download queue...
+Download queue: 13 items (1.66 MiB)
+
+Mirror `pagerduty` has been successfully updated.

system/t04_mirror/update.py

@@ -343,3 +343,20 @@ class UpdateMirror20Test(BaseTest):
 
     def output_processor(self, output):
         return "\n".join(sorted(output.split("\n")))
+
+
+class UpdateMirror21Test(BaseTest):
+    """
+    update mirrors: correct matching of Release checksums (internal pgp implementation)
+    """
+    longTest = False
+    configOverride = {"gpgProvider": "internal"}
+    fixtureGpg = True
+    fixtureCmds = [
+        "aptly mirror create --keyring=aptlytest.gpg pagerduty http://packages.pagerduty.com/pdagent deb/"
+    ]
+    runCmd = "aptly mirror update --keyring=aptlytest.gpg pagerduty"
+    outputMatchPrepare = filterOutSignature
+
+    def output_processor(self, output):
+        return "\n".join(line for line in output.split("\n") if ".deb" not in line)