From d5961016ffa5e22f1997d94d797800796ddb613b Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Thu, 19 Dec 2024 19:35:52 +0100
Subject: Remove legacy apt-key tests

---
 test/integration/test-apt-key            | 428 -------------------------------
 test/integration/test-apt-key-net-update |  41 ---
 2 files changed, 469 deletions(-)
 delete mode 100755 test/integration/test-apt-key
 delete mode 100755 test/integration/test-apt-key-net-update

diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key
deleted file mode 100755
index c2180c5f1..000000000
--- a/test/integration/test-apt-key
+++ /dev/null
@@ -1,428 +0,0 @@
-#!/bin/sh
-set -e
-
-# apt-key is a shell script, so relatively prune to be effected by 'crazy' things:
-# confuses config parser as there exists no way of escaping " currently.
-#TMPDIR="$(mktemp -d)/This is \"fü\$\$ing cràzy\", \$(man man | head -n1 | cut -d' ' -f 1)\$!"
-# gpg doesn't like | in path names – documented e.g. in the man gpg2 --agent-program
-#TMPDIR="$(mktemp -d)/This is fü\$\$ing cràzy, \$(man man | head -n1 | cut -d' ' -f 1)\$!"
-TMPDIR_ADD="This is fü\$\$ing cràzy, \$(apt -v)\$!"
-
-TESTDIR="$(readlink -f "$(dirname "$0")")"
-. "$TESTDIR/framework"
-
-setupenvironment
-chmod o+x "${TMPWORKINGDIRECTORY}/.."
-configarchitecture 'amd64'
-
-insertpackage 'unstable' 'bar' 'i386' '1'
-insertsource 'unstable' 'foo' 'all' '1'
-setupaptarchive --no-update
-
-# start from a clean plate again
-cleanplate() {
-	rm -rf "${ROOTDIR}/etc/apt/trusted.gpg.d/" "${ROOTDIR}/etc/apt/trusted.gpg"
-	mkdir "${ROOTDIR}/etc/apt/trusted.gpg.d/"
-}
-testmultigpg() {
-	testfailure --nomsg aptkey --quiet --readonly "$@"
-	testsuccess grep "^gpgv: Can't check signature" "${ROOTDIR}/tmp/testfailure.output"
-	testsuccess grep '^gpgv: Good signature from' "${ROOTDIR}/tmp/testfailure.output"
-}
-testaptkeyskeyring() {
-	local KEYRING="$1"
-	shift
-	local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/aptkeylistkeyring.output"
-	if ! aptkey --keyring "$KEYRING" list --with-colon 2>/dev/null | grep '^pub' | cut -d':' -f 5 > "$OUTPUT"; then
-		echo -n > "$OUTPUT"
-	fi
-	testfileequal "$OUTPUT" "$(mapkeynametokeyid "$@")"
-}
-testsuccessempty() {
-	testempty "$@"
-}
-testrun() {
-	local EXT="${1:-gpg}"
-	local TESTSTATE="${2:-testsuccess}"
-	echo "APT::Key::ArchiveKeyring \"${KEYDIR}/joesixpack.pub.gpg\";
-APT::Key::RemovedKeys \"${KEYDIR}/rexexpired.pub.gpg\";" > "${ROOTDIR}/etc/apt/apt.conf.d/aptkey.conf"
-
-	cleanplate
-	ln -sf "$(readlink -f "${KEYDIR}/joesixpack.pub.${EXT}")" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	testaptkeys 'Joe Sixpack'
-
-	${TESTSTATE} aptkey list
-	msgtest 'Check that paths in list output are not' 'double-slashed'
-	testfailure --nomsg grep '//' "${ROOTDIR}/tmp/${TESTSTATE}.output"
-
-	${TESTSTATE} aptkey finger
-	msgtest 'Check that paths in finger output are not' 'double-slashed'
-	testfailure --nomsg grep '//' "${ROOTDIR}/tmp/${TESTSTATE}.output"
-
-	cp -a "${KEYDIR}/joesixpack.pub.${EXT}" "${KEYDIR}/joesixpack.pub.${EXT}.bak"
-	if [ "$TESTSTATE" = 'testwarning' ]; then
-		testwarning aptkey --fakeroot update
-		testsuccess grep '^gpg: key .*DBAC8DAE: "Joe Sixpack (APT Testcases Dummy) <joe@example.org>" not changed$' "${ROOTDIR}/tmp/testwarning.output"
-		testsuccess grep '^W: .* are ignored as the file has an unsupported filetype' "${ROOTDIR}/tmp/testwarning.output"
-	else
-		testequalor2 'gpg: key DBAC8DAE: "Joe Sixpack (APT Testcases Dummy) <joe@example.org>" not changed
-gpg: Total number processed: 1
-gpg:              unchanged: 1' 'gpg: key 5A90D141DBAC8DAE: "Joe Sixpack (APT Testcases Dummy) <joe@example.org>" not changed
-gpg: Total number processed: 1
-gpg:              unchanged: 1' aptkey --fakeroot update
-	fi
-	testsuccess test -L "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	testsuccess cmp "${KEYDIR}/joesixpack.pub.${EXT}" "${KEYDIR}/joesixpack.pub.${EXT}.bak"
-
-	testaptkeys 'Joe Sixpack'
-	testfailure test -e "${ROOTDIR}/etc/apt/trusted.gpg"
-
-	${TESTSTATE} aptkey --fakeroot add "${KEYDIR}/rexexpired.pub.${EXT}"
-	testfilestats "${ROOTDIR}/etc/apt/trusted.gpg" '%a' '=' '644'
-
-	testaptkeys 'Rex Expired' 'Joe Sixpack'
-
-	msgtest 'Check that Sixpack key can be' 'exported'
-	aptkey export 'Sixpack' > "${TMPWORKINGDIRECTORY}/aptkey.export" 2>/dev/null
-	aptkey --keyring "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}" exportall > "${TMPWORKINGDIRECTORY}/aptkey.exportall"
-	testsuccess --nomsg cmp "${TMPWORKINGDIRECTORY}/aptkey.export" "${TMPWORKINGDIRECTORY}/aptkey.exportall"
-	testsuccess test -s "${TMPWORKINGDIRECTORY}/aptkey.export"
-	testsuccess test -s "${TMPWORKINGDIRECTORY}/aptkey.exportall"
-
-	msgtest 'Check that multiple keys can be' 'exported'
-	aptkey export 'Sixpack' 'Expired' > "${TMPWORKINGDIRECTORY}/aptkey.export" 2>/dev/null
-	aptkey --keyring "${KEYDIR}/rexexpired.pub.${EXT}" \
-		--keyring "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}" exportall > "${TMPWORKINGDIRECTORY}/aptkey.exportall"
-	testsuccess --nomsg cmp "${TMPWORKINGDIRECTORY}/aptkey.export" "${TMPWORKINGDIRECTORY}/aptkey.exportall"
-	testsuccess test -s "${TMPWORKINGDIRECTORY}/aptkey.export"
-	testsuccess test -s "${TMPWORKINGDIRECTORY}/aptkey.exportall"
-
-	msgtest 'Execute update again to trigger removal of' 'Rex Expired key'
-	${TESTSTATE} --nomsg aptkey --fakeroot update
-
-	testaptkeys 'Joe Sixpack'
-
-	msgtest "Try to remove a key which exists, but isn't in the" 'forced keyring'
-	testsuccess --nomsg aptkey --fakeroot --keyring "${ROOTDIR}/etc/apt/trusted.gpg" del DBAC8DAE
-
-	testaptkeys 'Joe Sixpack'
-
-	${TESTSTATE} aptkey --fakeroot del DBAC8DAE
-	"${TESTSTATE}empty" aptkey list
-
-	ln -sf "$(readlink -f "${KEYDIR}/joesixpack.pub.${EXT}")" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	testaptkeys 'Joe Sixpack'
-	msgtest "Remove a key from" 'forced keyring in trusted.d.gpg'
-	testsuccess --nomsg aptkey --fakeroot --keyring "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}" del DBAC8DAE
-	testsuccess cmp -s "$(readlink -f "${KEYDIR}/joesixpack.pub.${EXT}")" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}~"
-	"${TESTSTATE}empty" aptkey list
-
-	cp -a "${KEYDIR}/marvinparanoid.pub.asc" "${ROOTDIR}/etc/foobar.pub"
-	testsuccess aptkey --fakeroot --keyring "${ROOTDIR}/etc/foobar.pub" add "${KEYDIR}/rexexpired.pub.asc" "${KEYDIR}/joesixpack.pub.gpg"
-	testfilestats "${ROOTDIR}/etc/foobar.pub" '%a' '=' '644'
-	testaptkeyskeyring "${ROOTDIR}/etc/foobar.pub" 'Marvin Paranoid' 'Rex Expired' 'Joe Sixpack'
-	"${TESTSTATE}empty" aptkey list
-
-	msgtest 'Test key removal with' 'lowercase key ID' #keylength somewhere between 8byte and short
-	cleanplate
-	cp -a "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	${TESTSTATE} --nomsg aptkey --fakeroot del d141dbac8dae
-	"${TESTSTATE}empty" aptkey list
-
-	if [ "$(id -u)" != '0' ]; then
-		msgtest 'Test key removal with' 'unreadable key'
-		cleanplate
-		cp -a "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-		echo 'foobar' > "${ROOTDIR}/etc/apt/trusted.gpg.d/unreadablekey.${EXT}"
-		chmod 000 "${ROOTDIR}/etc/apt/trusted.gpg.d/unreadablekey.${EXT}"
-		testwarning --nomsg aptkey --fakeroot del d141dbac8dae
-		testwarning aptkey list
-		chmod 644 "${ROOTDIR}/etc/apt/trusted.gpg.d/unreadablekey.${EXT}"
-		rm -f "${ROOTDIR}/etc/apt/trusted.gpg.d/unreadablekey.${EXT}"
-		grep -v '^W: ' "${ROOTDIR}/tmp/testwarning.output" > "${ROOTDIR}/aptkeylist.output" || true
-		testempty cat "${ROOTDIR}/aptkeylist.output"
-	fi
-
-	msgtest 'Test key removal with' 'single key in real file'
-	cleanplate
-	cp -a "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	${TESTSTATE} --nomsg aptkey --fakeroot del DBAC8DAE
-	"${TESTSTATE}empty" aptkey list
-	testfailure test -e "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	testsuccess cmp "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}~"
-
-	msgtest 'Test key removal with' 'different key specs'
-	cleanplate
-	cp -a "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	cp -a "${KEYDIR}/marvinparanoid.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/marvinparanoid.${EXT}"
-	${TESTSTATE} --nomsg aptkey --fakeroot del 0xDBAC8DAE 528144E2
-	"${TESTSTATE}empty" aptkey list
-	testfailure test -e "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	testsuccess cmp "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}~"
-	testfailure test -e "${ROOTDIR}/etc/apt/trusted.gpg.d/marvinparanoid.${EXT}"
-	testsuccess cmp "${KEYDIR}/marvinparanoid.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/marvinparanoid.${EXT}~"
-
-	msgtest 'Test key removal with' 'long key ID'
-	cleanplate
-	cp -a "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	${TESTSTATE} --nomsg aptkey --fakeroot del 5A90D141DBAC8DAE
-	"${TESTSTATE}empty" aptkey list
-	testfailure test -e "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	testsuccess cmp "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}~"
-
-	msgtest 'Test key removal with' 'fingerprint'
-	cleanplate
-	cp -a "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	${TESTSTATE} --nomsg aptkey --fakeroot del 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE
-	"${TESTSTATE}empty" aptkey list
-	testfailure test -e "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	testsuccess cmp "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}~"
-
-	msgtest 'Test key removal with' 'spaced fingerprint'
-	cleanplate
-	cp -a "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	${TESTSTATE} --nomsg aptkey --fakeroot del '34A8 E9D1 8DB3 20F3 67E8 EAA0 5A90 D141 DBAC 8DAE'
-	"${TESTSTATE}empty" aptkey list
-	testfailure test -e "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	testsuccess cmp "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}~"
-
-	msgtest 'Test key removal with' 'single key in softlink'
-	cleanplate
-	ln -sf "$(readlink -f "${KEYDIR}/joesixpack.pub.${EXT}")" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	${TESTSTATE} --nomsg aptkey --fakeroot del DBAC8DAE
-	"${TESTSTATE}empty" aptkey list
-	testfailure test -e "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	testsuccess test -L "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}~"
-
-	cleanplate
-	${TESTSTATE} aptkey --fakeroot add "${KEYDIR}/joesixpack.pub.${EXT}"
-	ln -sf "$(readlink -f "${KEYDIR}/marvinparanoid.pub.${EXT}")" "${KEYDIR}/marvin paránöid.pub.${EXT}"
-	${TESTSTATE} aptkey --fakeroot add "${KEYDIR}/marvin paránöid.pub.${EXT}"
-	testaptkeys 'Joe Sixpack' 'Marvin Paranoid'
-	cp -a "${ROOTDIR}/etc/apt/trusted.gpg" "${KEYDIR}/testcase-multikey.pub.gpg" # store for reuse
-	aptkey --keyring "${KEYDIR}/testcase-multikey.pub.gpg" export > "${KEYDIR}/testcase-multikey.pub.asc"
-
-	msgtest 'Test key removal with' 'multi key in real file'
-	cleanplate
-	cp -a "${KEYDIR}/testcase-multikey.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/multikey.${EXT}"
-	${TESTSTATE} --nomsg aptkey --fakeroot del DBAC8DAE
-	testaptkeys 'Marvin Paranoid'
-	testsuccess cmp "${KEYDIR}/testcase-multikey.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/multikey.${EXT}~"
-
-	msgtest 'Test key removal with' 'multi key in softlink'
-	cleanplate
-	ln -s "$(readlink -f "${KEYDIR}/testcase-multikey.pub.${EXT}")" "${ROOTDIR}/etc/apt/trusted.gpg.d/multikey.${EXT}"
-	${TESTSTATE} --nomsg aptkey --fakeroot del DBAC8DAE
-	testaptkeys 'Marvin Paranoid'
-	testsuccess cmp "${KEYDIR}/testcase-multikey.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/multikey.${EXT}~"
-	testfailure test -L "${ROOTDIR}/etc/apt/trusted.gpg.d/multikey.${EXT}"
-	testsuccess test -L "${ROOTDIR}/etc/apt/trusted.gpg.d/multikey.${EXT}~"
-
-	msgtest 'Test key removal with' 'multiple files including key'
-	cleanplate
-	cp -a "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	cp -a "${KEYDIR}/testcase-multikey.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/multikey.${EXT}"
-	${TESTSTATE} --nomsg aptkey --fakeroot del DBAC8DAE
-	testaptkeys 'Marvin Paranoid'
-	testfailure test -e "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	testsuccess cmp "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}~"
-	testsuccess cmp "${KEYDIR}/testcase-multikey.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/multikey.${EXT}~"
-
-	cleanplate
-	cp -a "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	cp -a "${KEYDIR}/testcase-multikey.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/multikey.${EXT}"
-	testaptkeys 'Joe Sixpack' 'Joe Sixpack' 'Marvin Paranoid'
-	msgtest 'Test merge-back of' 'added keys'
-	${TESTSTATE} --nomsg aptkey adv --batch --yes --import "${KEYDIR}/rexexpired.pub.${EXT}"
-	testaptkeys 'Rex Expired' 'Joe Sixpack' 'Joe Sixpack' 'Marvin Paranoid'
-
-	msgtest 'Test merge-back of' 'removed keys'
-	${TESTSTATE} --nomsg aptkey adv --batch --yes --delete-keys 27CE74F9
-	testaptkeys 'Joe Sixpack' 'Joe Sixpack' 'Marvin Paranoid'
-
-	msgtest 'Test merge-back of' 'removed duplicate keys'
-	${TESTSTATE} --nomsg aptkey adv --batch --yes --delete-keys DBAC8DAE
-	testaptkeys 'Marvin Paranoid'
-
-	cleanplate
-	cp -a "${KEYDIR}/joesixpack.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/joesixpack.${EXT}"
-	cp -a "${KEYDIR}/testcase-multikey.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/multikey.${EXT}"
-	local SIGNATURE="${TMPWORKINGDIRECTORY}/signature"
-	msgtest 'Test signing a file' 'with a key'
-	echo 'Verify me. This is my signature.' > "$SIGNATURE"
-	echo 'lalalalala' > "${SIGNATURE}2"
-	testsuccess --nomsg aptkey --quiet --keyring "${KEYDIR}/marvinparanoid.pub.gpg" --secret-keyring "${KEYDIR}/marvinparanoid.sec" --readonly \
-		adv --batch --yes --default-key 'Marvin' --armor --detach-sign --sign --output "${SIGNATURE}.gpg" "${SIGNATURE}"
-	testsuccess test -s "${SIGNATURE}.gpg" -a -s "${SIGNATURE}"
-
-	msgtest 'Test verify a file' 'with no sig'
-	testfailure --nomsg aptkey --quiet --readonly --keyring "${KEYDIR}/testcase-multikey.pub.${EXT}" verify "${SIGNATURE}" "${SIGNATURE}2"
-
-	for GPGV in '' 'gpgv' 'gpgv1' 'gpgv2' 'gpgv-sq' 'gpgv-g10code'; do
-		echo "APT::Key::GPGVCommand \"$GPGV\";" > "${ROOTDIR}/etc/apt/apt.conf.d/00gpgvcmd"
-		if [ -n "$GPGV" ] && ! command dpkg -l gnupg1 2>&1 | grep -q '^ii'; then continue; fi
-
-		msgtest 'Test verify a file' 'with all keys'
-		${TESTSTATE} --nomsg aptkey --quiet --readonly verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		if [ "$(id -u)" != '0' ]; then
-			msgtest 'Test verify a file' 'with unreadable key'
-			echo 'foobar' > "${ROOTDIR}/etc/apt/trusted.gpg.d/unreadablekey.${EXT}"
-			chmod 000 "${ROOTDIR}/etc/apt/trusted.gpg.d/unreadablekey.${EXT}"
-			testwarning --nomsg aptkey --quiet --readonly verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-			testwarning aptkey list
-			# check that apt users see warnings, too
-			rm -rf "${ROOTDIR}/var/lib/apt/lists"
-			testwarning apt update
-
-			chmod 644 "${ROOTDIR}/etc/apt/trusted.gpg.d/unreadablekey.${EXT}"
-			rm -f "${ROOTDIR}/etc/apt/trusted.gpg.d/unreadablekey.${EXT}"
-		fi
-
-		msgtest 'Test verify a file' 'with good keyring'
-		testsuccess --nomsg aptkey --quiet --readonly --keyring "${KEYDIR}/testcase-multikey.pub.${EXT}" verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test verify a file' 'with good keyrings 1'
-		testsuccess --nomsg aptkey --quiet --readonly --keyring "${KEYDIR}/joesixpack.pub.${EXT}" \
-			--keyring "${KEYDIR}/marvinparanoid.pub.${EXT}" verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test verify a file' 'with good keyrings 2'
-		testsuccess --nomsg aptkey --quiet --readonly --keyring "${KEYDIR}/marvinparanoid.pub.${EXT}" \
-			--keyring "${KEYDIR}/joesixpack.pub.${EXT}" verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test fail verify a file' 'with bad keyring'
-		testfailure --nomsg aptkey --quiet --readonly --keyring "${KEYDIR}/joesixpack.pub.${EXT}" verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test fail verify a file' 'with non-existing keyring'
-		testfailure --nomsg aptkey --quiet --readonly --keyring "${KEYDIR}/does-not-exist.pub.${EXT}" verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-		testfailure test -e "${KEYDIR}/does-not-exist.pub.${EXT}"
-
-		# note: this isn't how apts gpgv method implements keyid for verify
-		msgtest 'Test verify a file' 'with good keyid'
-		${TESTSTATE} --nomsg aptkey --quiet --readonly --keyid 'Paranoid' verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test fail verify a file' 'with bad keyid'
-		testfailure --nomsg aptkey --quiet --readonly --keyid 'Sixpack' verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test fail verify a file' 'with non-existing keyid'
-		testfailure --nomsg aptkey --quiet --readonly --keyid 'Kalnischkies' verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test verify fails on' 'bad file'
-		testfailure --nomsg aptkey --quiet --readonly verify "${SIGNATURE}.gpg" "${SIGNATURE}2"
-
-		# try to perform an entire update with this gpgv
-		rm -rf "${ROOTDIR}/var/lib/apt/lists"
-		${TESTSTATE} apt update -o Test::Dir="${ROOTDIR}"
-	done
-	rm -f "${ROOTDIR}/etc/apt/apt.conf.d/00gpgvcmd"
-
-	msgtest 'Test verify a file' 'with good keyring'
-	testsuccess --nomsg aptkey --quiet --readonly --keyring "${KEYDIR}/testcase-multikey.pub.${EXT}" verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-	cleanplate
-	cat "${KEYDIR}/joesixpack.pub.gpg" "${KEYDIR}/marvinparanoid.pub.gpg" > "${KEYDIR}/double.pub.gpg"
-	cat "${KEYDIR}/joesixpack.pub.asc" "${KEYDIR}/marvinparanoid.pub.asc" > "${KEYDIR}/double.pub.asc"
-	cat "${KEYDIR}/joesixpack.sec" "${KEYDIR}/marvinparanoid.sec" > "${KEYDIR}/double.sec"
-	cp -a "${KEYDIR}/double.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/double.${EXT}"
-	cp -a "${KEYDIR}/testcase-multikey.pub.${EXT}" "${ROOTDIR}/etc/apt/trusted.gpg.d/multikey.${EXT}"
-	rm -f "${SIGNATURE}.gpg"
-	testsuccess aptkey --quiet --keyring "${KEYDIR}/double.pub.gpg" --secret-keyring "${KEYDIR}/double.sec" --readonly \
-		adv --batch --yes -u 'Marvin' -u 'Joe' --armor --detach-sign --sign --output "${SIGNATURE}.gpg" "${SIGNATURE}"
-	testsuccess test -s "${SIGNATURE}.gpg" -a -s "${SIGNATURE}"
-
-	for GPGV in '' 'gpgv' 'gpgv1' 'gpgv2' 'gpgv-sq' 'gpgv-g10code'; do
-		echo "APT::Key::GPGVCommand \"$GPGV\";" > "${ROOTDIR}/etc/apt/apt.conf.d/00gpgvcmd"
-		if [ -n "$GPGV" ] && ! command dpkg -l gnupg1 2>&1 | grep -q '^ii'; then continue; fi
-
-		msgtest 'Test verify a doublesigned file' 'with all keys'
-		${TESTSTATE} --nomsg aptkey --quiet --readonly verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test verify a doublesigned file' 'with good keyring joe'
-		testmultigpg --keyring "${KEYDIR}/joesixpack.pub.${EXT}" verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test verify a doublesigned file' 'with good keyring marvin'
-		testmultigpg --keyring "${KEYDIR}/marvinparanoid.pub.${EXT}" verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test fail verify a doublesigned file' 'with bad keyring'
-		testfailure --nomsg aptkey --quiet --readonly --keyring "${KEYDIR}/rexexpired.pub.${EXT}" verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test fail verify a doublesigned file' 'with non-existing keyring'
-		testfailure --nomsg aptkey --quiet --readonly --keyring "${KEYDIR}/does-not-exist.pub.${EXT}" verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-		testfailure test -e "${KEYDIR}/does-not-exist.pub.${EXT}"
-
-		# note: this isn't how apts gpgv method implements keyid for verify
-		msgtest 'Test verify a doublesigned file' 'with good keyid'
-		testmultigpg --keyid 'Paranoid' verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test fail verify a doublesigned file' 'with bad keyid'
-		testfailure --nomsg aptkey --quiet --readonly --keyid 'Rex' verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test fail verify a doublesigned file' 'with non-existing keyid'
-		testfailure --nomsg aptkey --quiet --readonly --keyid 'Kalnischkies' verify "${SIGNATURE}.gpg" "${SIGNATURE}"
-
-		msgtest 'Test verify fails on' 'bad doublesigned file'
-		testfailure --nomsg aptkey --quiet --readonly verify "${SIGNATURE}.gpg" "${SIGNATURE}2"
-	done
-	rm -f "${ROOTDIR}/etc/apt/apt.conf.d/00gpgvcmd"
-}
-
-setupgpgcommand() {
-	local GPGEXE;
-	if command dpkg -l gnupg1 2>&1 | grep -q '^ii'; then
-		if [ "$1" = '1' ]; then
-			GPGEXE='gpg1'
-		else
-			GPGEXE='gpg'
-		fi
-	else
-		if [ "$1" = '1' ]; then
-			GPGEXE='gpg'
-		else
-			GPGEXE='gpg2'
-		fi
-	fi
-	msgmsg 'Force tests to be run with' "$GPGEXE"
-	echo "APT::Key::GPGCommand \"$GPGEXE\";" > "${ROOTDIR}/etc/apt/apt.conf.d/00gpgcmd"
-	testsuccess aptkey --readonly adv --version
-	cp "${ROOTDIR}/tmp/testsuccess.output" "${TMPWORKINGDIRECTORY}/aptkey.version"
-	testsuccess grep "^gpg (GnuPG) $1\." "${TMPWORKINGDIRECTORY}/aptkey.version"
-}
-
-(cd /; find "${TMPWORKINGDIRECTORY}/keys" -name '*.pub' -type f) | while read trusted; do
-	testsuccess aptkey --keyring "$trusted" adv --armor --export --output "${trusted}.asc"
-	cp -a "$trusted" "${trusted}.gpg"
-done
-
-# run with default (whatever this is) in current CWD with relative paths
-ROOTDIR="./rootdir"
-KEYDIR="./keys"
-testrun
-
-# run with … and up the game with a strange CWD & absolute paths
-ROOTDIR="${TMPWORKINGDIRECTORY}/rootdir"
-KEYDIR="${TMPWORKINGDIRECTORY}/keys"
-mkdir inaccessible
-cd inaccessible
-chmod 600 ../inaccessible
-testfilestats "${TMPWORKINGDIRECTORY}/inaccessible" '%a' '=' '600'
-
-setupgpgcommand '1'
-testrun
-setupgpgcommand '2'
-testrun
-
-msgmsg 'Tests to be run with' 'asc files'
-rm -f "${ROOTDIR}/etc/apt/apt.conf.d/00gpgcmd"
-testrun 'asc'
-
-msgmsg 'Tests to be run with' 'bad files'
-# don't let the plate be so clean anymore
-cleanplate() {
-	rm -rf "${ROOTDIR}/etc/apt/trusted.gpg.d/" "${ROOTDIR}/etc/apt/trusted.gpg"
-	mkdir "${ROOTDIR}/etc/apt/trusted.gpg.d/"
-	touch "${ROOTDIR}/etc/apt/trusted.gpg.d/emptyfile.gpg"
-	touch "${ROOTDIR}/etc/apt/trusted.gpg.d/emptyfile.asc"
-	echo 'broken' > "${ROOTDIR}/etc/apt/trusted.gpg.d/brokenfile.gpg"
-	echo 'broken' > "${ROOTDIR}/etc/apt/trusted.gpg.d/brokenfile.asc"
-}
-testrun 'gpg' 'testwarning'
diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update
deleted file mode 100755
index b9f716e10..000000000
--- a/test/integration/test-apt-key-net-update
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-set -e
-
-TESTDIR="$(readlink -f "$(dirname "$0")")"
-. "$TESTDIR/framework"
-
-setupenvironment
-configarchitecture "i386"
-changetowebserver
-
-# setup env
-mkdir -p var/lib/apt/keyrings
-mkdir -p usr/share/keyrings
-
-# install the fake master keyring
-install -m0644 keys/test-master-keyring.pub usr/share/keyrings
-echo "APT::Key::MasterKeyring \"${TMPWORKINGDIRECTORY}/usr/share/keyrings/test-master-keyring.pub\";" >> ./aptconfig.conf
-
-# setup archive-keyring
-mkdir -p aptarchive/ubuntu/project
-install -m0644 keys/test-archive-keyring.pub aptarchive/ubuntu/project/
-echo "APT::Key::ArchiveKeyringURI \"http://localhost:${APTHTTPPORT}/ubuntu/project/test-archive-keyring.pub\";" >> ./aptconfig.conf
-echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
-
-# test against the "real" webserver
-testsuccess aptkey --fakeroot net-update
-testfailure grep 'not added' rootdir/tmp/testsuccess.output
-testaptkeys 'oldarchive' 'newarchive'
-
-# now try a different one
-# setup archive-keyring
-mkdir -p aptarchive/ubuntu/project
-install -m0644 keys/marvinparanoid.pub aptarchive/ubuntu/project/
-echo "APT::Key::ArchiveKeyringURI \"http://localhost:${APTHTTPPORT}/ubuntu/project/marvinparanoid.pub\";" >> ./aptconfig.conf
-echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
-
-# test against the "real" webserver
-testsuccessequal "Checking for new archive signing keys now
-Key 'DE66AECA9151AFA1877EC31DE8525D47528144E2' not added. It is not signed with a master key" aptkey --fakeroot net-update
-
-testaptkeys 'oldarchive' 'newarchive'
-- 
cgit v1.2.3-70-g09d2