Merge branch 'feature/apt-dpkg-comm'

[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 c07af7bd0f39484371cb14f513abdbd18b53a534..1c5d120d87aa8dc23de671ed95bf196d3360b2ce 100755 (executable)
--- a/test/integration/test-partial-file-support
+++ b/test/integration/test-partial-file-support
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'amd64'
 
@@ -68,8 +68,8 @@ testdownloadfile() {
 }
 
 TESTFILE='aptarchive/testfile'
-cp -a ${TESTDIR}/framework $TESTFILE
-cp -a ${TESTDIR}/framework "${TESTFILE}2"
+cp -a "${TESTDIR}/framework" "$TESTFILE"
+cp -a "${TESTDIR}/framework" "${TESTFILE}2"
 
 followuprequest() {
        local DOWN='./downloaded/testfile'
@@ -80,7 +80,7 @@ followuprequest() {
 
        webserverconfig 'aptwebserver::support::content-range' 'false'
        copysource $TESTFILE 1M $DOWN
-       testdownloadfile 'completely downloaded file' "${1}/testfile" "$DOWN" '=' "SHA1:$(sha1sum "$TESTFILE" | cut -d' ' -f 1)"
+       testdownloadfile 'completely downloaded file' "${1}/testfile" "$DOWN" '=' "SHA256:$(sha256sum "$TESTFILE" | cut -d' ' -f 1)"
        testwebserverlaststatuscode '416' "$DOWNLOADLOG"
        webserverconfig 'aptwebserver::support::content-range' 'true'
 
@@ -141,8 +141,11 @@ serverconfigs() {
        testrun "$1"
 }
 
-serverconfigs 'http://localhost:8080'
+serverconfigs "http://localhost:${APTHTTPPORT}"
 
 changetohttpswebserver
 
-serverconfigs 'https://localhost:4433'
+serverconfigs "https://localhost:${APTHTTPSPORT}"
+
+webserverconfig 'aptwebserver::redirect::replace::/redirectme/' "https://localhost:${APTHTTPSPORT}/"
+serverconfigs "http://localhost:${APTHTTPPORT}/redirectme"