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 f1e67c6d84596ec9b77b7a220287725937e721d9..e90fd240b6b90548e679681a0ef432e1aebd01b9 100755 (executable)
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -8,22 +8,29 @@ 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/
 
 mv aptarchive/pool aptarchive/newpool
 mv aptarchive/dists aptarchive/newdists
 
 changetowebserver -o aptwebserver::redirect::replace::/pool/=/newpool/ \
                  -o aptwebserver::redirect::replace::/dists/=/newdists/
 
 mv aptarchive/pool aptarchive/newpool
 mv aptarchive/dists aptarchive/newdists
 

-msgtest 'Test redirection works in' 'apt-get update'
-aptget update -qq && msgpass || msgfail
+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
-testequal 'Hit http://localhost unstable InRelease
-Hit http://localhost unstable/main Sources
-Hit http://localhost unstable/main amd64 Packages
-Hit http://localhost unstable/main Translation-en
-Reading package lists...' aptget update
+       # check that I-M-S header is kept in redirections
+       testsuccessequal "Hit:1 $1 unstable InRelease
+Reading package lists..." aptget update

 
 

-msgtest 'Test redirection works in' 'package download'
-aptget install unrelated --download-only -qq && msgpass || msgfail
+       msgtest 'Test redirection works in' 'package download'
+       testsuccess --nomsg aptget install unrelated --download-only -y
+}
+
+testrun "http://localhost:${APTHTTPPORT}"
+
+rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives
+changetohttpswebserver
+
+testrun "https://localhost:${APTHTTPSPORT}"