Merge branch 'debian/experimental-no-abi-break' into debian/sid

[apt.git] / test / integration / test-partial-file-support

diff --git a/test/integration/test-partial-file-support b/test/integration/test-partial-file-support
index 8d1c51ae0bbd0292f00609a74f21ff4eaef495e3..382789e68515efed21d0b9e98b6d73ce7fb22586 100755 (executable)
--- a/test/integration/test-partial-file-support
+++ b/test/integration/test-partial-file-support
@@ -18,7 +18,7 @@ testdownloadfile() {
        rm -f "$DOWNLOG"
        msgtest "Testing download of file $2 with" "$1"
        if ! downloadfile "$2" "$3" > "$DOWNLOG"; then
-               cat "$DOWNLOG"
+               cat >&2 "$DOWNLOG"
                msgfail
        else
                msgpass
@@ -40,21 +40,23 @@ testdownloadfile() {
                if [ "$EXPECTED" "$4" "$hash" ]; then
                        msgpass
                else
-                       cat "$DOWNLOG"
+                       cat >&2 "$DOWNLOG"
                        msgfail "expected: $EXPECTED ; got: $hash"
                fi
        done
 }
 
 testwebserverlaststatuscode() {
-       STATUS="$(mktemp)"
+       local DOWNLOG='download-testfile.log'
+       rm -f "$DOWNLOG"
+       local STATUS="$(mktemp)"
        addtrap "rm $STATUS;"
        msgtest 'Test last status code from the webserver was' "$1"
-       downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" >/dev/null
+       downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG"
        if [ "$(cat "$STATUS")" = "$1" ]; then
                msgpass
        else
-               cat download-testfile.log
+               cat >&2 "$DOWNLOG"
                msgfail "Status was $(cat "$STATUS")"
        fi
 }
@@ -64,8 +66,7 @@ TESTFILE='aptarchive/testfile'
 cp -a ${TESTDIR}/framework $TESTFILE
 
 testrun() {
-       downloadfile "$1/_config/set/aptwebserver::support::range/true" '/dev/null' >/dev/null
-       testwebserverlaststatuscode '200'
+       webserverconfig 'aptwebserver::support::range' 'true'
 
        copysource $TESTFILE 0 ./testfile
        testdownloadfile 'no data' "${1}/testfile" './testfile' '='
@@ -92,8 +93,7 @@ testrun() {
        testdownloadfile 'old data' "${1}/testfile" './testfile' '='
        testwebserverlaststatuscode '200'
 
-       downloadfile "$1/_config/set/aptwebserver::support::range/false" '/dev/null' >/dev/null
-       testwebserverlaststatuscode '200'
+       webserverconfig 'aptwebserver::support::range' 'false'
 
        copysource $TESTFILE 20 ./testfile
        testdownloadfile 'no server support' "${1}/testfile" './testfile' '='