show final solution in --no-download --fix-missing mode

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

diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key
index d5adec5bde08f521b7a1e6665471dcc8d00025ff..666136098a25be06f7581f534e1d4e9ee6cbcd43 100755 (executable)
--- a/test/integration/test-apt-key
+++ b/test/integration/test-apt-key
@@ -1,8 +1,15 @@
 #!/bin/sh
 set -e
 
 #!/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'
 
 setupenvironment
 configarchitecture 'amd64'


@@ -12,12 +19,10 @@ cleanplate() {
        rm -rf rootdir/etc/apt/trusted.gpg.d/ rootdir/etc/apt/trusted.gpg
        mkdir rootdir/etc/apt/trusted.gpg.d/
 }
        rm -rf rootdir/etc/apt/trusted.gpg.d/ rootdir/etc/apt/trusted.gpg
        mkdir rootdir/etc/apt/trusted.gpg.d/
 }

-
-testaptkeys() {
-       if ! aptkey list | grep '^pub' > aptkey.list; then
-               echo -n > aptkey.list
-       fi
-       testequal "$1" cat ./aptkey.list
+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

 }
 
 echo 'APT::Key::ArchiveKeyring "./keys/joesixpack.pub";
 }
 
 echo 'APT::Key::ArchiveKeyring "./keys/joesixpack.pub";


@@ -25,26 +30,31 @@ APT::Key::RemovedKeys "./keys/rexexpired.pub";' > rootdir/etc/apt/apt.conf.d/apt
 
 testrun() {
        cleanplate
 
 testrun() {
        cleanplate

-       ln -sf ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       ln -sf "${TMPWORKINGDIRECTORY}/keys/joesixpack.pub" rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg

 
        msgtest 'Check that paths in list output are not' 'double-slashed'
        aptkey list 2>&1 | grep -q '//' && msgfail || msgpass
 
        msgtest 'Check that paths in finger output are not' 'double-slashed'
        aptkey finger 2>&1 | grep -q '//' && msgfail || msgpass
 
        msgtest 'Check that paths in list output are not' 'double-slashed'
        aptkey list 2>&1 | grep -q '//' && msgfail || msgpass
 
        msgtest 'Check that paths in finger output are not' 'double-slashed'
        aptkey finger 2>&1 | grep -q '//' && msgfail || msgpass

+       testaptkeys 'Joe Sixpack'

 
 

-       testaptkeys 'pub   2048R/DBAC8DAE 2010-08-18'
-
-       testequal 'gpg: key DBAC8DAE: "Joe Sixpack (APT Testcases Dummy) <joe@example.org>" not changed
+       testsuccessequal 'gpg: key DBAC8DAE: "Joe Sixpack (APT Testcases Dummy) <joe@example.org>" not changed

 gpg: Total number processed: 1
 gpg:              unchanged: 1' aptkey --fakeroot update
 
 gpg: Total number processed: 1
 gpg:              unchanged: 1' aptkey --fakeroot update
 

-       testaptkeys 'pub   2048R/DBAC8DAE 2010-08-18'
+       testaptkeys 'Joe Sixpack'
+       testfailure test -e rootdir/etc/apt/trusted.gpg

 
        testsuccess aptkey --fakeroot add ./keys/rexexpired.pub
 
        testsuccess aptkey --fakeroot add ./keys/rexexpired.pub

+       msgtest 'Check if trusted.gpg is created with permissions set to' '0644'
+       if [ "$(stat -c '%a' rootdir/etc/apt/trusted.gpg )" = '644' ]; then
+               msgpass
+       else
+               msgfail
+       fi

 
 

-       testaptkeys 'pub   2048R/27CE74F9 2013-07-12 [expired: 2013-07-13]
-pub   2048R/DBAC8DAE 2010-08-18'
+       testaptkeys 'Rex Expired' 'Joe Sixpack'

 
        msgtest 'Check that Sixpack key can be' 'exported'
        aptkey export 'Sixpack' > aptkey.export
 
        msgtest 'Check that Sixpack key can be' 'exported'
        aptkey export 'Sixpack' > aptkey.export


@@ -56,30 +66,47 @@ pub   2048R/DBAC8DAE 2010-08-18'
        msgtest 'Execute update again to trigger removal of' 'Rex Expired key'
        testsuccess --nomsg aptkey --fakeroot update
 
        msgtest 'Execute update again to trigger removal of' 'Rex Expired key'
        testsuccess --nomsg aptkey --fakeroot update
 

-       testaptkeys 'pub   2048R/DBAC8DAE 2010-08-18'
+       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
 
 
        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 'pub   2048R/DBAC8DAE 2010-08-18'
+       testaptkeys 'Joe Sixpack'

 
        testsuccess aptkey --fakeroot del DBAC8DAE
        testempty aptkey list
 
 
        testsuccess aptkey --fakeroot del DBAC8DAE
        testempty aptkey list
 

+       msgtest 'Test key removal with' 'lowercase key ID' #keylength somewhere between 8byte and short
+       cleanplate
+       cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       testsuccess --nomsg aptkey --fakeroot del d141dbac8dae
+       testempty aptkey list
+

        msgtest 'Test key removal with' 'single key in real file'
        cleanplate
        cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        testsuccess --nomsg aptkey --fakeroot del DBAC8DAE
        testempty aptkey list
        msgtest 'Test key removal with' 'single key in real file'
        cleanplate
        cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        testsuccess --nomsg aptkey --fakeroot del DBAC8DAE
        testempty aptkey list

-       testsuccess test ! -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       testfailure test -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg

        testsuccess cmp keys/joesixpack.pub 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
        testsuccess --nomsg aptkey --fakeroot del 5A90D141DBAC8DAE
        testempty aptkey list
        msgtest 'Test key removal with' 'long key ID'
        cleanplate
        cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        testsuccess --nomsg aptkey --fakeroot del 5A90D141DBAC8DAE
        testempty aptkey list

-       testsuccess test ! -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       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' 'fingerprint'
        testsuccess cmp keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg~
 
        msgtest 'Test key removal with' 'fingerprint'


@@ -87,38 +114,38 @@ pub   2048R/DBAC8DAE 2010-08-18'
        cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        testsuccess --nomsg aptkey --fakeroot del 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE
        testempty aptkey list
        cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        testsuccess --nomsg aptkey --fakeroot del 34A8E9D18DB320F367E8EAA05A90D141DBAC8DAE
        testempty aptkey list

-       testsuccess test ! -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       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' 'single key in softlink'
        cleanplate
        testsuccess cmp keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg~
 
        msgtest 'Test key removal with' 'single key in softlink'
        cleanplate

-       ln -s $(readlink -f ./keys/joesixpack.pub) rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       ln -s "$(readlink -f ./keys/joesixpack.pub)" rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg

        testsuccess --nomsg aptkey --fakeroot del DBAC8DAE
        testempty aptkey list
        testsuccess --nomsg aptkey --fakeroot del DBAC8DAE
        testempty aptkey list

-       testsuccess test ! -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       testfailure test -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg

        testsuccess test -L rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg~
 
        cleanplate
        testsuccess aptkey --fakeroot add ./keys/joesixpack.pub
        testsuccess test -L rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg~
 
        cleanplate
        testsuccess aptkey --fakeroot add ./keys/joesixpack.pub

-       testsuccess aptkey --fakeroot add ./keys/marvinparanoid.pub
-       testaptkeys 'pub   2048R/DBAC8DAE 2010-08-18
-pub   2048R/528144E2 2011-01-16'
+       ln -sf "$(readlink -f ./keys/marvinparanoid.pub)" "./keys/marvin paránöid.pub"
+       testsuccess aptkey --fakeroot add "./keys/marvin paránöid.pub"
+       testaptkeys 'Joe Sixpack' 'Marvin Paranoid'

        cp -a rootdir/etc/apt/trusted.gpg keys/testcase-multikey.pub # store for reuse
 
        msgtest 'Test key removal with' 'multi key in real file'
        cleanplate
        cp -a keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg
        testsuccess --nomsg aptkey --fakeroot del DBAC8DAE
        cp -a rootdir/etc/apt/trusted.gpg keys/testcase-multikey.pub # store for reuse
 
        msgtest 'Test key removal with' 'multi key in real file'
        cleanplate
        cp -a keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg
        testsuccess --nomsg aptkey --fakeroot del DBAC8DAE

-       testaptkeys 'pub   2048R/528144E2 2011-01-16'
+       testaptkeys 'Marvin Paranoid'

        testsuccess cmp keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg~
 
        msgtest 'Test key removal with' 'multi key in softlink'
        cleanplate
        testsuccess cmp keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg~
 
        msgtest 'Test key removal with' 'multi key in softlink'
        cleanplate

-       ln -s $(readlink -f ./keys/testcase-multikey.pub) rootdir/etc/apt/trusted.gpg.d/multikey.gpg
+       ln -s "$(readlink -f ./keys/testcase-multikey.pub)" rootdir/etc/apt/trusted.gpg.d/multikey.gpg

        testsuccess --nomsg aptkey --fakeroot del DBAC8DAE
        testsuccess --nomsg aptkey --fakeroot del DBAC8DAE

-       testaptkeys 'pub   2048R/528144E2 2011-01-16'
+       testaptkeys 'Marvin Paranoid'

        testsuccess cmp keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg~
        testsuccess cmp keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg~

-       testsuccess test ! -L rootdir/etc/apt/trusted.gpg.d/multikey.gpg
+       testfailure test -L rootdir/etc/apt/trusted.gpg.d/multikey.gpg

        testsuccess test -L rootdir/etc/apt/trusted.gpg.d/multikey.gpg~
 
        msgtest 'Test key removal with' 'multiple files including key'
        testsuccess test -L rootdir/etc/apt/trusted.gpg.d/multikey.gpg~
 
        msgtest 'Test key removal with' 'multiple files including key'


@@ -126,51 +153,130 @@ pub   2048R/528144E2 2011-01-16'
        cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        cp -a keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg
        testsuccess --nomsg aptkey --fakeroot del DBAC8DAE
        cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        cp -a keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg
        testsuccess --nomsg aptkey --fakeroot del DBAC8DAE

-       testaptkeys 'pub   2048R/528144E2 2011-01-16'
-       testsuccess test ! -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       testaptkeys 'Marvin Paranoid'
+       testfailure test -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg

        testsuccess cmp keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg~
        testsuccess cmp keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg~
 
        cleanplate
        cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        cp -a keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg
        testsuccess cmp keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg~
        testsuccess cmp keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg~
 
        cleanplate
        cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        cp -a keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg

-       testaptkeys 'pub   2048R/DBAC8DAE 2010-08-18
-pub   2048R/DBAC8DAE 2010-08-18
-pub   2048R/528144E2 2011-01-16'
+       testaptkeys 'Joe Sixpack' 'Joe Sixpack' 'Marvin Paranoid'

        msgtest 'Test merge-back of' 'added keys'
        testsuccess --nomsg aptkey adv --batch --yes --import keys/rexexpired.pub
        msgtest 'Test merge-back of' 'added keys'
        testsuccess --nomsg aptkey adv --batch --yes --import keys/rexexpired.pub

-       testaptkeys 'pub   2048R/27CE74F9 2013-07-12 [expired: 2013-07-13]
-pub   2048R/DBAC8DAE 2010-08-18
-pub   2048R/DBAC8DAE 2010-08-18
-pub   2048R/528144E2 2011-01-16'
+       testaptkeys 'Rex Expired' 'Joe Sixpack' 'Joe Sixpack' 'Marvin Paranoid'

 
        msgtest 'Test merge-back of' 'removed keys'
        testsuccess --nomsg aptkey adv --batch --yes --delete-keys 27CE74F9
 
        msgtest 'Test merge-back of' 'removed keys'
        testsuccess --nomsg aptkey adv --batch --yes --delete-keys 27CE74F9

-       testaptkeys 'pub   2048R/DBAC8DAE 2010-08-18
-pub   2048R/DBAC8DAE 2010-08-18
-pub   2048R/528144E2 2011-01-16'
+       testaptkeys 'Joe Sixpack' 'Joe Sixpack' 'Marvin Paranoid'

 
        msgtest 'Test merge-back of' 'removed duplicate keys'
        testsuccess --nomsg aptkey adv --batch --yes --delete-keys DBAC8DAE
 
        msgtest 'Test merge-back of' 'removed duplicate keys'
        testsuccess --nomsg aptkey adv --batch --yes --delete-keys DBAC8DAE

-       testaptkeys 'pub   2048R/528144E2 2011-01-16'
+       testaptkeys 'Marvin Paranoid'
+
+       cleanplate
+       cp -a keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       cp -a keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg
+       msgtest 'Test signing a file' 'with a key'
+       echo 'Verify me. This is my signature.' > signature
+       echo 'lalalalala' > signature2
+       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
+
+       msgtest 'Test verify a file' 'with no sig'
+       testfailure --nomsg aptkey --quiet --readonly --keyring keys/testcase-multikey.pub verify signature signature2
+
+       for GPGV in '' 'gpgv' 'gpgv2'; do
+               echo "APT::Key::GPGVCommand \"$GPGV\";" > rootdir/etc/apt/apt.conf.d/00gpgvcmd
+
+               msgtest 'Test verify a file' 'with all keys'
+               testsuccess --nomsg aptkey --quiet --readonly verify signature.gpg signature
+
+               msgtest 'Test verify a file' 'with good keyring'
+               testsuccess --nomsg aptkey --quiet --readonly --keyring keys/testcase-multikey.pub verify signature.gpg signature
+
+               msgtest 'Test fail verify a file' 'with bad keyring'
+               testfailure --nomsg aptkey --quiet --readonly --keyring keys/joesixpack.pub verify signature.gpg signature
+
+               msgtest 'Test fail verify a file' 'with non-existing keyring'
+               testfailure --nomsg aptkey --quiet --readonly --keyring keys/does-not-exist.pub verify signature.gpg signature
+               testfailure test -e keys/does-not-exist.pub
+
+               # note: this isn't how apts gpgv method implements keyid for verify
+               msgtest 'Test verify a file' 'with good keyid'
+               testsuccess --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 signature2
+       done
+       rm -f rootdir/etc/apt/apt.conf.d/00gpgvcmd
+
+       msgtest 'Test verify a file' 'with good keyring'
+       testsuccess --nomsg aptkey --quiet --readonly --keyring keys/testcase-multikey.pub verify signature.gpg signature
+
+       cleanplate
+       cat keys/joesixpack.pub keys/marvinparanoid.pub > keys/double.pub
+       cat keys/joesixpack.sec keys/marvinparanoid.sec > keys/double.sec
+       cp -a keys/double.pub rootdir/etc/apt/trusted.gpg.d/double.gpg
+       cp -a keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg
+       testsuccess aptkey --quiet --keyring keys/double.pub --secret-keyring keys/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' 'gpgv2'; do
+               echo "APT::Key::GPGVCommand \"$GPGV\";" > rootdir/etc/apt/apt.conf.d/00gpgvcmd
+
+               msgtest 'Test verify a doublesigned file' 'with all keys'
+               testsuccess --nomsg aptkey --quiet --readonly verify signature.gpg signature
+
+               msgtest 'Test verify a doublesigned file' 'with good keyring joe'
+               testmultigpg --keyring keys/joesixpack.pub verify signature.gpg signature
+
+               msgtest 'Test verify a doublesigned file' 'with good keyring marvin'
+               testmultigpg --keyring keys/marvinparanoid.pub verify signature.gpg signature
+
+               msgtest 'Test fail verify a doublesigned file' 'with bad keyring'
+               testfailure --nomsg aptkey --quiet --readonly --keyring keys/rexexpired.pub verify signature.gpg signature
+
+               msgtest 'Test fail verify a doublesigned file' 'with non-existing keyring'
+               testfailure --nomsg aptkey --quiet --readonly --keyring keys/does-not-exist.pub verify signature.gpg signature
+               testfailure test -e keys/does-not-exist.pub
+
+               # 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 signature2
+       done
+       rm -f rootdir/etc/apt/apt.conf.d/00gpgvcmd

 }
 
 setupgpgcommand() {
        echo "APT::Key::GPGCommand \"$1\";" > rootdir/etc/apt/apt.conf.d/00gpgcmd
 }
 
 setupgpgcommand() {
        echo "APT::Key::GPGCommand \"$1\";" > rootdir/etc/apt/apt.conf.d/00gpgcmd

-       msgtest 'Test that apt-key uses for the following tests command' "$1"
-       aptkey adv --version >aptkey.version 2>&1
-       if grep -q "^Executing: $1 --" aptkey.version; then
-               msgpass
-       else
-               cat aptkey.version
-               msgfail
-       fi
+       msgmsg 'Force tests to be run with' "$1"
+       testsuccess aptkey --readonly adv --version
+       cp rootdir/tmp/testsuccess.output aptkey.version
+       testsuccess grep "^gpg (GnuPG) $2\." aptkey.version

 }
 
 # run with default (whatever this is)
 testrun
 # run with …
 }
 
 # run with default (whatever this is)
 testrun
 # run with …

-setupgpgcommand 'gpg'
+setupgpgcommand 'gpg' '1'

 testrun
 testrun

-setupgpgcommand 'gpg2'
+setupgpgcommand 'gpg2' '2'

 testrun
 testrun