ensure outdated files are dropped without lists-cleanup

[apt.git] / test / integration / test-apt-key

diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key
index dbe01c15308f59ee3fb2a319a10ccd445f35f582..82b64963cd7ba5888c48e77eb1320ea90151a33f 100755 (executable)
--- a/test/integration/test-apt-key
+++ b/test/integration/test-apt-key
@@ -1,8 +1,15 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+# 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
 configarchitecture 'amd64'
@@ -13,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
 
@@ -107,6 +85,17 @@ gpg:              unchanged: 1' aptkey --fakeroot update
        testfailure test -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        testsuccess cmp keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg~
 
+       msgtest 'Test key removal with' 'different key specs'
+       cleanplate
+       cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       cp -a keys/marvinparanoid.pub rootdir/etc/apt/trusted.gpg.d/marvinparanoid.gpg
+       testsuccess --nomsg aptkey --fakeroot del 0xDBAC8DAE 528144E2
+       testempty aptkey list
+       testfailure test -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       testsuccess cmp keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg~
+       testfailure test -e rootdir/etc/apt/trusted.gpg.d/marvinparanoid.gpg
+       testsuccess cmp keys/marvinparanoid.pub rootdir/etc/apt/trusted.gpg.d/marvinparanoid.gpg~
+
        msgtest 'Test key removal with' 'long key ID'
        cleanplate
        cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
@@ -187,6 +176,7 @@ gpg:              unchanged: 1' aptkey --fakeroot update
        echo 'Verify me. This is my signature.' > signature
        testsuccess --nomsg aptkey --quiet --keyring keys/marvinparanoid.pub --secret-keyring keys/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
 
 
        for GPGV in '' 'gpgv' 'gpgv2'; do