diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-04-19 01:24:46 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-04-19 01:27:31 +0200 |
| commit | 05f64ca2e483709faa6bc69dfa79129d2d4c679e (patch) | |
| tree | b0937914182c227b6e662f3820b0e58f86f6c617 /test/integration/test-apt-key | |
| parent | f4c7a238f4c29ac9b1e1172f103ab7dec5c5807d (diff) | |
| parent | ae37ab01c4657fc2ae32cabb4f96f5f7e5b551d4 (diff) | |
Merge branch 'debian/jessie' into debian/experimental
Conflicts:
apt-pkg/acquire-item.cc
cmdline/apt-key.in
methods/https.cc
test/integration/test-apt-key
test/integration/test-multiarch-foreign
Diffstat (limited to 'test/integration/test-apt-key')
| -rwxr-xr-x | test/integration/test-apt-key | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key index 989fe658c..486acccc8 100755 --- a/test/integration/test-apt-key +++ b/test/integration/test-apt-key @@ -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 + |