report warnings&errors consistently in edit-sources

[apt.git] / test / integration / test-bug-733028-gpg-resource-limit

diff --git a/test/integration/test-bug-733028-gpg-resource-limit b/test/integration/test-bug-733028-gpg-resource-limit
index f9c80496350d046cfa3293ffa3eeef38c5d44bb9..69baf4e5c356837466a0d617e796ee9111980ff7 100755 (executable)
--- a/test/integration/test-bug-733028-gpg-resource-limit
+++ b/test/integration/test-bug-733028-gpg-resource-limit
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'i386'
 
@@ -13,15 +13,13 @@ setupaptarchive --no-update
 for i in $(seq 1 50); do
        touch rootdir/etc/apt/trusted.gpg.d/emptykey-${i}.gpg
 done
+testaptkeys 'Joe Sixpack'
 
-aptkey list | grep '^pub' > aptkey.list
-testfileequal ./aptkey.list 'pub   2048R/DBAC8DAE 2010-08-18'
-
+testsuccess aptget update
 msgtest 'Test for no gpg errors/warnings in' 'apt-get update'
-aptget update > update.log 2>&1
-if grep -iq 'GPG' update.log; then
+if grep -iq 'GPG' rootdir/tmp/testsuccess.output; then
+       cat rootdir/tmp/testsuccess.output
        msgfail
-       cat update.log
 else
        msgpass
 fi