improve debug output in case downloadfile fails

[ntk/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 8d1c51a..5ab326d 100755 (executable)
--- a/test/integration/test-partial-file-support
+++ b/test/integration/test-partial-file-support
@@ -13,17 +13,18 @@ copysource() {
        touch -d "$(stat --format '%y' "${TESTFILE}")" "$3"
 }
 
+DOWNLOADLOG='rootdir/tmp/testdownloadfile.log'
+
 testdownloadfile() {
-       local DOWNLOG='download-testfile.log'
-       rm -f "$DOWNLOG"
+       rm -f "$DOWNLOADLOG"
        msgtest "Testing download of file $2 with" "$1"
-       if ! downloadfile "$2" "$3" > "$DOWNLOG"; then
-               cat "$DOWNLOG"
+       if ! downloadfile "$2" "$3" > "$DOWNLOADLOG"; then
+               cat >&2 "$DOWNLOADLOG"
                msgfail
        else
                msgpass
        fi
-       cat "$DOWNLOG" | while read field hash; do
+       cat "$DOWNLOADLOG" | while read field hash; do
                local EXPECTED
                case "$field" in
                'MD5Sum-Hash:') EXPECTED="$(md5sum "$TESTFILE" | cut -d' ' -f 1)";;
@@ -40,64 +41,48 @@ testdownloadfile() {
                if [ "$EXPECTED" "$4" "$hash" ]; then
                        msgpass
                else
-                       cat "$DOWNLOG"
+                       cat >&2 "$DOWNLOADLOG"
                        msgfail "expected: $EXPECTED ; got: $hash"
                fi
        done
 }
 
-testwebserverlaststatuscode() {
-       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
-       if [ "$(cat "$STATUS")" = "$1" ]; then
-               msgpass
-       else
-               cat download-testfile.log
-               msgfail "Status was $(cat "$STATUS")"
-       fi
-}
-
-
 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' '='
-       testwebserverlaststatuscode '200'
+       testwebserverlaststatuscode '200' "$DOWNLOADLOG"
 
        copysource $TESTFILE 20 ./testfile
        testdownloadfile 'valid partial data' "${1}/testfile" './testfile' '='
-       testwebserverlaststatuscode '206'
+       testwebserverlaststatuscode '206' "$DOWNLOADLOG"
 
        copysource /dev/zero 20 ./testfile
        testdownloadfile 'invalid partial data' "${1}/testfile" './testfile' '!='
-       testwebserverlaststatuscode '206'
+       testwebserverlaststatuscode '206' "$DOWNLOADLOG"
 
        copysource $TESTFILE 1M ./testfile
        testdownloadfile 'completely downloaded file' "${1}/testfile" './testfile' '='
-       testwebserverlaststatuscode '416'
+       testwebserverlaststatuscode '416' "$DOWNLOADLOG"
 
        copysource /dev/zero 1M ./testfile
        testdownloadfile 'too-big partial file' "${1}/testfile" './testfile' '='
-       testwebserverlaststatuscode '200'
+       testwebserverlaststatuscode '200' "$DOWNLOADLOG"
 
        copysource /dev/zero 20 ./testfile
        touch ./testfile
        testdownloadfile 'old data' "${1}/testfile" './testfile' '='
-       testwebserverlaststatuscode '200'
+       testwebserverlaststatuscode '200' "$DOWNLOADLOG"
 
-       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' '='
-       testwebserverlaststatuscode '200'
+       testwebserverlaststatuscode '200' "$DOWNLOADLOG"
 }
 
 testrun 'http://localhost:8080'