require explicit paths to dsc/control as we do for deb files

[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 4901a32d745b90760779568494a7be96989e8213..e90fd240b6b90548e679681a0ef432e1aebd01b9 100755 (executable)
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -8,7 +8,7 @@ configarchitecture 'amd64'
 
 buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable'
 
 
 buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable'
 

-setupaptarchive
+setupaptarchive --no-update

 changetowebserver -o aptwebserver::redirect::replace::/pool/=/newpool/ \
                  -o aptwebserver::redirect::replace::/dists/=/newdists/
 
 changetowebserver -o aptwebserver::redirect::replace::/pool/=/newpool/ \
                  -o aptwebserver::redirect::replace::/dists/=/newdists/
 


@@ -16,26 +16,21 @@ 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"

        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

-        local LOG='update.log'
-        # strip away the [ 304 B ] info
-        aptget update 2>&1 | sed -e 's/\ \[.*//' > $LOG
-       testequal "Hit $1 unstable InRelease
-Hit $1 unstable/main Sources
-Hit $1 unstable/main amd64 Packages
-Hit $1 unstable/main Translation-en
-Reading package lists..." cat $LOG
+       testsuccessequal "Hit:1 $1 unstable InRelease
+Reading package lists..." aptget update

 
        msgtest 'Test redirection works in' 'package download'
        testsuccess --nomsg aptget install unrelated --download-only -y
 }
 
 
        msgtest 'Test redirection works in' 'package download'
        testsuccess --nomsg aptget install unrelated --download-only -y
 }
 

-testrun 'http://localhost:8080'
+testrun "http://localhost:${APTHTTPPORT}"

 
 rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives
 changetohttpswebserver
 
 
 rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives
 changetohttpswebserver
 

-testrun 'https://localhost:4433'
+testrun "https://localhost:${APTHTTPSPORT}"