zh_TW.po: remove several fuzzy tags after review

[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 e90fd240b6b90548e679681a0ef432e1aebd01b9..3d88baaef44bb649c918b23031c1d416bd5f0ec5 100755 (executable)
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 setupenvironment
 configarchitecture 'amd64'
 
 setupenvironment
 configarchitecture 'amd64'
 


@@ -16,21 +16,29 @@ mv aptarchive/pool aptarchive/newpool
 mv aptarchive/dists aptarchive/newdists
 
 testrun() {
 mv aptarchive/dists aptarchive/newdists
 
 testrun() {

-       msgmsg 'Test redirection works in method boundaries' "$1"
+       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
        msgtest 'Test redirection works in' 'apt-get update'
        testsuccess --nomsg aptget update
 
        # check that I-M-S header is kept in redirections

-       testsuccessequal "Hit:1 $1 unstable InRelease
+       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
 }
 
 Reading package lists..." aptget update
 
        msgtest 'Test redirection works in' 'package download'
        testsuccess --nomsg aptget install unrelated --download-only -y
 }
 

-testrun "http://localhost:${APTHTTPPORT}"
+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
 
 changetohttpswebserver
 

-testrun "https://localhost:${APTHTTPSPORT}"
+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