X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/4fc6b7570c3e97b65c118b58cdf6729fa94c9b03..8683da61448b62df2ccc1918e4c605c9e6d4ab1d:/test/integration/test-partial-file-support?ds=inline diff --git a/test/integration/test-partial-file-support b/test/integration/test-partial-file-support index c07af7bd0..9b5eed1e5 100755 --- 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' @@ -96,6 +96,7 @@ followuprequest() { testrun() { webserverconfig 'aptwebserver::support::range' 'true' + webserverconfig 'aptwebserver::response-header::Accept-Ranges' 'bytes' local DOWN='./downloaded/testfile' copysource $TESTFILE 0 $DOWN @@ -125,7 +126,11 @@ testrun() { testdownloadfile 'old data' "${1}/testfile" "$DOWN" '=' testwebserverlaststatuscode '200' "$DOWNLOADLOG" - webserverconfig 'aptwebserver::support::range' 'false' + if [ "${1%%:*}" = 'https' ] && expr match "$1" "^.*/redirectme$" >/dev/null; then + webserverconfig 'aptwebserver::response-header::Accept-Ranges' 'none' + else + webserverconfig 'aptwebserver::support::range' 'false' + fi copysource $TESTFILE 20 $DOWN testdownloadfile 'no server support' "${1}/testfile" "$DOWN" '=' @@ -141,8 +146,12 @@ 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 "https://localhost:${APTHTTPSPORT}/redirectme" +serverconfigs "http://localhost:${APTHTTPPORT}/redirectme"