summaryrefslogtreecommitdiff
path: root/test/integration/test-bug-733028-gpg-resource-limit
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-12-18 13:17:11 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-12-19 23:04:34 +0100
commit785cb6fc843f4751ff9c57dcdf375ad061e83f36 (patch)
treec935de62685665da82d75167c470e12cef43fb67 /test/integration/test-bug-733028-gpg-resource-limit
parent803491dc568d2994745c3c4359f68053f7261658 (diff)
tests: support gpg2 properly in all testcases
The output changes slightly between different versions, which we already dealt with in the main testcase for apt-key, but there are two more which do not test both versions explicitly and so still had gpg1 output to check against as this is the default at the moment. Git-Dch: Ignore
Diffstat (limited to 'test/integration/test-bug-733028-gpg-resource-limit')
-rwxr-xr-xtest/integration/test-bug-733028-gpg-resource-limit4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/integration/test-bug-733028-gpg-resource-limit b/test/integration/test-bug-733028-gpg-resource-limit
index 430c8ad61..69baf4e5c 100755
--- a/test/integration/test-bug-733028-gpg-resource-limit
+++ b/test/integration/test-bug-733028-gpg-resource-limit
@@ -13,9 +13,7 @@ setupaptarchive --no-update
for i in $(seq 1 50); do
touch rootdir/etc/apt/trusted.gpg.d/emptykey-${i}.gpg
done
-
-aptkey list | grep '^pub' > aptkey.list
-testfileequal ./aptkey.list 'pub 2048R/DBAC8DAE 2010-08-18'
+testaptkeys 'Joe Sixpack'
testsuccess aptget update
msgtest 'Test for no gpg errors/warnings in' 'apt-get update'