ensure outdated files are dropped without lists-cleanup

[apt.git] / test / integration / test-bug-602412-dequote-redirect

diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect
index 6393f0c27cf613b31fe085709533085d40c88953..3d88baaef44bb649c918b23031c1d416bd5f0ec5 100755 (executable)
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -1,14 +1,14 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'amd64'
 
 buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable'
 
-setupaptarchive
+setupaptarchive --no-update
 changetowebserver -o aptwebserver::redirect::replace::/pool/=/newpool/ \
                  -o aptwebserver::redirect::replace::/dists/=/newdists/
 
@@ -16,23 +16,29 @@ mv aptarchive/pool aptarchive/newpool
 mv aptarchive/dists aptarchive/newdists
 
 testrun() {
+       msgmsg "Test $1 redirection works in method boundaries" "$2"
        msgtest 'Test redirection works in' 'apt-get update'
        testsuccess --nomsg aptget update
 
        # check that I-M-S header is kept in redirections
-       testequal "Hit $1 unstable InRelease
-Hit $1 unstable/main Sources
-Hit $1 unstable/main amd64 Packages
-Hit $1 unstable/main Translation-en
+       testsuccessequal "Hit:1 $2 unstable InRelease
 Reading package lists..." aptget update
 
        msgtest 'Test redirection works in' 'package download'
        testsuccess --nomsg aptget install unrelated --download-only -y
 }
 
-testrun 'http://localhost:8080'
+for CODE in 301 302 307; do
+       webserverconfig 'aptwebserver::redirect::httpcode' "$CODE"
+       testrun "$CODE" "http://localhost:${APTHTTPPORT}"
+       testsuccess grep "^HTTP/1.1 $CODE " aptarchive/webserver.log
+       rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives
+done
 
-rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives
 changetohttpswebserver
 
-testrun 'https://localhost:4433'
+for CODE in 301 302 307; do
+       webserverconfig 'aptwebserver::redirect::httpcode' "$CODE"
+       testrun "$CODE" "https://localhost:${APTHTTPSPORT}"
+       rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives
+done