diff options
| author | Michael Vogt <mvo@debian.org> | 2015-06-23 12:17:35 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-06-23 12:17:35 +0100 |
| commit | 245dde96193702f7f51389d3583dee547f8ba366 (patch) | |
| tree | 6cf8c191641c760bcc6a6c08fb0ff65d27e0cffd /test/integration/test-apt-key | |
| parent | 5530255b5f3ad7de2e23dfcb39ce325001126501 (diff) | |
| parent | c8a4ce6cbed57ae108dc955d4a850f9b129a0693 (diff) | |
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
Diffstat (limited to 'test/integration/test-apt-key')
| -rwxr-xr-x | test/integration/test-apt-key | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key index b6b7b7909..486acccc8 100755 --- a/test/integration/test-apt-key +++ b/test/integration/test-apt-key @@ -17,7 +17,7 @@ testaptkeys() { if ! aptkey list | grep '^pub' > aptkey.list; then echo -n > aptkey.list fi - testequal "$1" cat ./aptkey.list + testfileequal './aptkey.list' "$1" } echo 'APT::Key::ArchiveKeyring "./keys/joesixpack.pub"; @@ -35,7 +35,7 @@ testrun() { 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 @@ -73,6 +73,12 @@ pub 2048R/DBAC8DAE 2010-08-18' testsuccess aptkey --fakeroot del DBAC8DAE testempty aptkey list + msgtest 'Test key removal with' 'lowercase key ID' #keylength somewher 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 @@ -181,3 +187,4 @@ setupgpgcommand 'gpg' testrun setupgpgcommand 'gpg2' testrun + |