summaryrefslogtreecommitdiff
path: root/test/integration
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-01-27 17:04:53 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2014-09-27 00:12:14 +0200
commitba72845c07b2682f251dc7661869d20095260f8f (patch)
tree183f50e41fa3fc29bf54439c4c1a37190e3a2a1a /test/integration
parent38005d8b24bb81f4862d2c2a228e4a49a2af4ccd (diff)
allow to specify fingerprints in 'apt-key del'
Diffstat (limited to 'test/integration')
-rwxr-xr-xtest/integration/test-apt-key8
-rwxr-xr-xtest/integration/test-apt-key-net-update2
2 files changed, 9 insertions, 1 deletions
diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key
index e863e54a4..6bece40d7 100755
--- a/test/integration/test-apt-key
+++ b/test/integration/test-apt-key
@@ -72,6 +72,14 @@ pub 2048R/DBAC8DAE 2010-08-18'
testsuccess 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'
+ cleanplate
+ 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
+ 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
diff --git a/test/integration/test-apt-key-net-update b/test/integration/test-apt-key-net-update
index b5fb796d0..b3c118555 100755
--- a/test/integration/test-apt-key-net-update
+++ b/test/integration/test-apt-key-net-update
@@ -41,7 +41,7 @@ echo 'APT::Key::Net-Update-Enabled "1";' >> ./aptconfig.conf
# test against the "real" webserver
testequal "Checking for new archive signing keys now
-Key 'E8525D47528144E2' not added. It is not signed with a master key" aptkey --fakeroot net-update
+Key 'DE66AECA9151AFA1877EC31DE8525D47528144E2' not added. It is not signed with a master key" aptkey --fakeroot net-update
aptkey list | grep '^pub' > aptkey.list
testfileequal ./aptkey.list 'pub 1024R/F68C85A3 2013-12-19