diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2017-05-28 22:26:17 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2017-06-26 23:31:15 +0200 |
| commit | 188f297a2af4c15cb1d502360d1e478644b5b810 (patch) | |
| tree | 4063f8442876359787efe907ac9dbdd86d97fdea /test/integration | |
| parent | d7c92411dc1f4c6be098d1425f9c1c075e0c2154 (diff) | |
show .diff/Index properly as ignored if we fallback
Moving the code responsible for parsing the Index file from ::Done into
the slightly earlier ::VerifyDone allows us to still "fail" the download
if we can't make use of the Index for whatever reason, so that the
progress log correctly displays "Ign" instead of "Get" for the file.
This also makes quiet a few debug messages proper error messages (but
those are still hidden by default for Ign lines).
Diffstat (limited to 'test/integration')
| -rwxr-xr-x | test/integration/test-pdiff-usage | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index 430551fa4..e7b052d49 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -50,7 +50,7 @@ wasmergeused() { if echo "$*" | grep -q -- '-o test::cannot-use-pdiff=1'; then msgtest 'Check if pdiff was' 'not used' cp -a rootdir/tmp/testsuccess.output rootdir/tmp/aptupdate.output - testsuccess --nomsg grep "diff/Index with Message: Couldn't parse pdiff index" rootdir/tmp/aptupdate.output + testsuccess --nomsg grep "^Ign:.* Packages\.diff/Index" rootdir/tmp/aptupdate.output return; fi @@ -336,7 +336,7 @@ SHA256-Download: generatereleasefiles '+1hour' signreleasefiles wasmergeused "$@" -o test::cannot-use-pdiff=1 - testsuccess grep 'bytes (Limit is' rootdir/tmp/aptupdate.output + testsuccess grep 'bytes, but limit is' rootdir/tmp/aptupdate.output testnopackage oldstuff testsuccessequal "$(cat "${PKGFILE}-new") " aptcache show apt newstuff |