From 785cb6fc843f4751ff9c57dcdf375ad061e83f36 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 18 Dec 2015 13:17:11 +0100
Subject: tests: support gpg2 properly in all testcases

The output changes slightly between different versions, which we already
dealt with in the main testcase for apt-key, but there are two more
which do not test both versions explicitly and so still had gpg1 output
to check against as this is the default at the moment.

Git-Dch: Ignore
---
 test/integration/test-apt-key | 29 -----------------------------
 1 file changed, 29 deletions(-)

(limited to 'test/integration/test-apt-key')

diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key
index 7a2849b4e..907824db1 100755
--- a/test/integration/test-apt-key
+++ b/test/integration/test-apt-key
@@ -20,35 +20,6 @@ cleanplate() {
 	mkdir rootdir/etc/apt/trusted.gpg.d/
 }
 
-createlistofkeys() {
-	while [ -n "$1" ]; do
-		# gpg 2.1 has a slightly different output format
-		if grep -q ' rsa2048/' aptkey.list; then
-			case "$1" in
-				*Joe*|*Sixpack*) echo 'pub   rsa2048/DBAC8DAE 2010-08-18';;
-				*Rex*|*Expired*) echo 'pub   rsa2048/27CE74F9 2013-07-12 [expired: 2013-07-13]';;
-				*Marvin*|*Paranoid*) echo 'pub   rsa2048/528144E2 2011-01-16';;
-				*) echo 'UNKNOWN KEY';;
-			esac
-		else
-			case "$1" in
-				*Joe*|*Sixpack*) echo 'pub   2048R/DBAC8DAE 2010-08-18';;
-				*Rex*|*Expired*) echo 'pub   2048R/27CE74F9 2013-07-12 [expired: 2013-07-13]';;
-				*Marvin*|*Paranoid*) echo 'pub   2048R/528144E2 2011-01-16';;
-				*) echo 'UNKNOWN KEY';;
-			esac
-		fi
-		shift
-	done
-}
-
-testaptkeys() {
-	if ! aptkey list | grep '^pub' > aptkey.list; then
-		echo -n > aptkey.list
-	fi
-	testfileequal './aptkey.list' "$(createlistofkeys "$@")"
-}
-
 echo 'APT::Key::ArchiveKeyring "./keys/joesixpack.pub";
 APT::Key::RemovedKeys "./keys/rexexpired.pub";' > rootdir/etc/apt/apt.conf.d/aptkey.conf
 
-- 
cgit v1.2.3