properly format multiline error messages

[apt.git] / test / integration / test-pdiff-usage

diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index 4e2d1f182a8bdbfee4bad808f460de9ce48c2b62..9c7946083d3788b7d9616cee65ebb7d0923489f0 100755 (executable)
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -61,6 +61,8 @@ wasmergeused() {
        else
                msgpass
        fi
+
+       testequal '1' grep -c rred:601 rootdir/tmp/testsuccess.output
 }
 
 testrun() {
@@ -214,7 +216,7 @@ SHA256-Download:
        cp Packages-future aptarchive/Packages
        rm -f rootdir/var/lib/apt/lists/*_Contents-*
        webserverconfig 'aptwebserver::overwrite::.*Contents-.*::filename' '/hacked-i386.gz'
-       testfailure apt update "$@" -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1
+       testfailure apt update "$@"
        webserverconfig 'aptwebserver::overwrite::.*Contents-.*::filename' '/Contents-i386.gz'
        cp rootdir/tmp/testfailure.output patchdownload.output
        testfailure grep 'rred:600' patchdownload.output
@@ -222,6 +224,14 @@ SHA256-Download:
        testsuccessequal "$(cat "${PKGFILE}")
 " aptcache show apt oldstuff
 
+       # we reuse the entire state of the previous test here
+       msgmsg "Testcase: good files from previous fails are picked up from partial: $*"
+       wasmergeused "$@"
+       testfailure grep '^GET /Packages.diff/Index HTTP/1.1' rootdir/tmp/testsuccess.output
+       testnopackage oldstuff
+       testsuccessequal "$(cat Packages-future)
+" aptcache show apt newstuff futurestuff
+
        # we reuse the archive state of the previous test here
        msgmsg "Testcase: downloading a patch fails, but successful fallback: $*"
        rm -rf rootdir/var/lib/apt/lists
@@ -292,7 +302,7 @@ SHA256-Download:
  $(sha256sum "${PATCHFILE}.gz" | cut -d' ' -f 1) $(stat -c%s "${PATCHFILE}.gz")000 $(basename "${PATCHFILE}.gz")" > "$PATCHINDEX"
        generatereleasefiles '+1hour'
        signreleasefiles
-       testsuccess apt update -o Debug::pkgAcquire::Diffs=1 "$@"
+       testsuccess apt update "$@"
        cp -f rootdir/tmp/testsuccess.output rootdir/tmp/aptupdate.output
        testsuccess grep 'bytes (Limit is' rootdir/tmp/aptupdate.output
        testnopackage oldstuff
@@ -301,6 +311,9 @@ SHA256-Download:
 }
 echo 'Debug::pkgAcquire::Diffs "true";
 Debug::Acquire::Transaction "true";
+Debug::pkgAcquire::Worker "true";
+Debug::Acquire::http "true";
+Debug::pkgAcquire "true";
 Debug::pkgAcquire::rred "true";' > rootdir/etc/apt/apt.conf.d/rreddebug.conf
 
 testcase() {