From: Julian Andres Klode <jak@debian.org>
Date: Thu, 1 Sep 2016 08:57:49 +0000 (+0200)
Subject: test-apt-cdrom: Fix for gnupg 2.1.15
X-Git-Tag: 1.3_rc4~11
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/0343b48e06fb990ee15a020bc6716b1a5a984e14

test-apt-cdrom: Fix for gnupg 2.1.15

gpg annoyingly changed its output and broke our test suite
again by adding two extra lines about key type and issuer.
Really annoying.

Those lines also have more than one space after the colon,
so let's use \s* there - and also change the other lines to
support variable length whitespace in case gpg decides to
break things there too.
---

diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index a3c3b5ba0..212f0baa4 100755
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -29,7 +29,12 @@ aptcdromlog() {
 	test ! -e rootdir/media/cdrom || echo "CD-ROM is mounted, but shouldn't be!"
 	test -e rootdir/media/cdrom-unmounted || echo "Unmounted CD-ROM doesn't exist, but it should!"
 	aptcdrom "$@" -o quiet=1 >rootdir/tmp/apt-cdrom.log 2>&1 </dev/null
-	sed -e '/gpgv\?: Signature made/ d' -e '/gpgv\?: Good signature/ d' -e '/^Identifying/ d' -e '/Reading / d' rootdir/tmp/apt-cdrom.log
+	sed -e '/gpgv\?:\s*Signature made/ d' \
+		-e '/gpgv\?:\s*Good signature/ d' \
+		-e '/gpgv\?:\s*using RSA key/ d' \
+		-e '/gpgv\?:\s*issuer/ d' \
+		-e '/^Identifying/ d' \
+		-e '/Reading / d' rootdir/tmp/apt-cdrom.log
 	test ! -e rootdir/media/cdrom || echo "CD-ROM is mounted, but shouldn't be!"
 	test -e rootdir/media/cdrom-unmounted || echo "Unmounted CD-ROM doesn't exist, but it should!"
 }