Merge branch 'bye-apt-key' into 'main'

Stop using apt-key for verification and move apt-key to test/

See merge request apt-team/apt!406

3 files changed, 3 insertions, 46 deletions

diff --git a/test/integration/framework b/test/integration/framework
index a64488f0e..6d4d0b07f 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -192,7 +192,7 @@ aptcache() { runapt apt-cache "$@"; }
 aptcdrom() { runapt apt-cdrom "$@"; }
 aptget() { runapt apt-get "$@"; }
 aptftparchive() { runapt "${APTFTPARCHIVEBINDIR}/apt-ftparchive" "$@"; }
-aptkey() { runapt apt-key "$@"; }
+aptkey() { runapt "${APTTESTHELPERSBINDIR}/apt-key" "$@"; }
 aptmark() { runapt apt-mark "$@"; }
 aptsortpkgs() { runapt apt-sortpkgs "$@"; }
 apt() { runapt apt "$@"; }
diff --git a/test/integration/test-apt-key-used-in-maintainerscript b/test/integration/test-apt-key-used-in-maintainerscript
deleted file mode 100755
index b5ed3279f..000000000
--- a/test/integration/test-apt-key-used-in-maintainerscript
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-set -e
-
-TESTDIR="$(readlink -f "$(dirname "$0")")"
-. "$TESTDIR/framework"
-
-setupenvironment
-unset APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE
-configarchitecture 'native'
-configdpkgnoopchroot
-
-buildingpkg() {
-	local PKG="$1"
-	shift
-	setupsimplenativepackage "$PKG" 'native' '1' 'unstable' "$@"
-	BUILDDIR="incoming/${PKG}-1"
-	echo '#!/bin/sh
-apt-key list >/dev/null' > "${BUILDDIR}/debian/postinst"
-	buildpackage "$BUILDDIR" 'unstable' 'main' 'native'
-	rm -rf "$BUILDDIR"
-}
-buildingpkg 'aptkeyuser-nodepends' 'Depends: unrelated'
-buildingpkg 'aptkeyuser-depends' 'Depends: gnupg'
-
-insertinstalledpackage 'unrelated' 'native' '1'
-insertinstalledpackage 'gnupg' 'native' '1'
-testdpkgnotinstalled 'aptkeyuser-depends' 'aptkeyuser-nodepends'
-
-testsuccess apt install ./incoming/aptkeyuser-depends_*.changes -y
-cp rootdir/tmp/testsuccess.output apt.output
-testdpkginstalled 'aptkeyuser-depends'
-testfailure grep '^Warning: This will BREAK' apt.output
-testsuccess grep '^Warning: apt-key' apt.output
-
-testsuccess apt install --with-source ./incoming/aptkeyuser-nodepends_*.changes aptkeyuser-nodepends -y
-cp rootdir/tmp/testsuccess.output apt.output
-testdpkginstalled 'aptkeyuser-nodepends'
-testsuccess grep '^Warning: This will BREAK' apt.output
-testsuccess grep '^Warning: apt-key' apt.output
-
-testsuccess aptkey list
-cp rootdir/tmp/testsuccess.output aptkey.list
-testsuccess grep '^Warning: apt-key' aptkey.list
diff --git a/test/integration/test-method-gpgv-legacy-keyring b/test/integration/test-method-gpgv-legacy-keyring
index 3c3e4536c..8afa5671b 100755
--- a/test/integration/test-method-gpgv-legacy-keyring
+++ b/test/integration/test-method-gpgv-legacy-keyring
@@ -24,7 +24,7 @@ rm rootdir/etc/apt/trusted.gpg.d/*.gpg
 testwarningequal "Get:1 file:${TMPWORKINGDIRECTORY}/aptarchive unstable InRelease [1420 B]
 Get:1 file:${TMPWORKINGDIRECTORY}/aptarchive unstable InRelease [1420 B]
 Reading package lists...
-W: file:${TMPWORKINGDIRECTORY}/aptarchive/dists/unstable/InRelease: Key is stored in legacy trusted.gpg keyring (${TMPWORKINGDIRECTORY}/rootdir/etc/apt/trusted.gpg), see the DEPRECATION section in apt-key(8) for details." aptget update -q
+W: file:${TMPWORKINGDIRECTORY}/aptarchive/dists/unstable/InRelease: Key is stored in legacy trusted.gpg keyring (${TMPWORKINGDIRECTORY}/rootdir/etc/apt/trusted.gpg). Use Signed-By instead. See the USER CONFIGURATION section in apt-secure(8) for details." aptget update -q
 
 # 2.4.0 regression: If the InRelease file was signed with two keys, fallback to trusted.gpg did not
 # work: It ran the fallback, but then ignored the result, as keys were still missing.
@@ -32,4 +32,4 @@ signreleasefiles 'Joe Sixpack,Marvin Paranoid'
 testwarningequal "Get:1 file:${TMPWORKINGDIRECTORY}/aptarchive unstable InRelease [1867 B]
 Get:1 file:${TMPWORKINGDIRECTORY}/aptarchive unstable InRelease [1867 B]
 Reading package lists...
-W: file:${TMPWORKINGDIRECTORY}/aptarchive/dists/unstable/InRelease: Key is stored in legacy trusted.gpg keyring (${TMPWORKINGDIRECTORY}/rootdir/etc/apt/trusted.gpg), see the DEPRECATION section in apt-key(8) for details." aptget update -q -omsg=with-two-signatures
+W: file:${TMPWORKINGDIRECTORY}/aptarchive/dists/unstable/InRelease: Key is stored in legacy trusted.gpg keyring (${TMPWORKINGDIRECTORY}/rootdir/etc/apt/trusted.gpg). Use Signed-By instead. See the USER CONFIGURATION section in apt-secure(8) for details." aptget update -q -omsg=with-two-signatures