X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/4e03c47de15164f2656d9655edab6fb3570cb2f2..5ef35b188f3f35ab948da87e78bc6255ebf9d658:/test/integration/test-apt-key

diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key
index a1a0d883d..907824db1 100755
--- 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,41 +20,12 @@ 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
 
 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
@@ -125,7 +103,7 @@ gpg:              unchanged: 1' aptkey --fakeroot update
 
 	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
 	testfailure test -e rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
@@ -133,7 +111,8 @@ gpg:              unchanged: 1' aptkey --fakeroot update
 
 	cleanplate
 	testsuccess aptkey --fakeroot add ./keys/joesixpack.pub
-	testsuccess aptkey --fakeroot add ./keys/marvinparanoid.pub
+	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
 
@@ -146,7 +125,7 @@ gpg:              unchanged: 1' aptkey --fakeroot update
 
 	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
 	testaptkeys 'Marvin Paranoid'
 	testsuccess cmp keys/testcase-multikey.pub rootdir/etc/apt/trusted.gpg.d/multikey.gpg~
@@ -186,6 +165,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
@@ -225,13 +205,13 @@ setupgpgcommand() {
 	msgmsg 'Force tests to be run with' "$1"
 	testsuccess aptkey --readonly adv --version
 	cp rootdir/tmp/testsuccess.output aptkey.version
-	testsuccess grep "^Executing: $1 --" aptkey.version
+	testsuccess grep "^gpg (GnuPG) $2\." aptkey.version
 }
 
 # run with default (whatever this is)
 testrun
 # run with …
-setupgpgcommand 'gpg'
+setupgpgcommand 'gpg' '1'
 testrun
-setupgpgcommand 'gpg2'
+setupgpgcommand 'gpg2' '2'
 testrun