summaryrefslogtreecommitdiff
path: root/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-08-09 17:40:57 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2015-08-10 17:27:59 +0200
commitdd676dc71e31c20f66d5b9d9ac1c5a4c8883cd79 (patch)
tree59132e28901c22f80033b7e7232bbdb93ccf67a5 /test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
parentcc480836c739e36dc0c741fa333248c0a8150ec7 (diff)
enhance "hit paywall" error message to mention the probable cause
Reporting errors from Done() is bad for progress reporting and such, so factoring this out is a good idea and we start with moving the supposed- to-be clearsigned file isn't clearsigned out first – improving the error message in the process as we use the same message for a similar case (NODATA) as this is what I have to look at with the venue wifi at DebCamp and the old errormessage doesn't really say anything.
Diffstat (limited to 'test/integration/test-ubuntu-bug-784473-InRelease-one-message-only')
-rwxr-xr-xtest/integration/test-ubuntu-bug-784473-InRelease-one-message-only5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
index 754487a90..dbcb49a41 100755
--- a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
+++ b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
@@ -27,8 +27,9 @@ MD5Sum:
1b895931853981ad8204d2439821b999 4144 Packages.gz'; echo; cat ${RELEASE}.old;) > ${RELEASE}
done
-msgtest 'The unsigned garbage before signed block is' 'ignored'
-aptget update -qq 2>&1 | grep -q 'W:.*Does not start with a cleartext signature' && msgpass || msgfail
+testfailure aptget update
+testsuccess grep '^W:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output
+
ROOTDIR="$(readlink -f .)"
testsuccessequal "Package files: