X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/fd785e49fa017abbe1871f18af515fdedb3ad183..07cb47e71f4de7e3c57f9dcfbfb82e4e5566aed6:/test/integration/test-bug-602412-dequote-redirect?ds=sidebyside

diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect
index f1e67c6d8..6393f0c27 100755
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -15,15 +15,24 @@ changetowebserver -o aptwebserver::redirect::replace::/pool/=/newpool/ \
 mv aptarchive/pool aptarchive/newpool
 mv aptarchive/dists aptarchive/newdists
 
-msgtest 'Test redirection works in' 'apt-get update'
-aptget update -qq && msgpass || msgfail
-
-# 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
-
-msgtest 'Test redirection works in' 'package download'
-aptget install unrelated --download-only -qq && msgpass || msgfail
+testrun() {
+	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
+Reading package lists..." aptget update
+
+	msgtest 'Test redirection works in' 'package download'
+	testsuccess --nomsg aptget install unrelated --download-only -y
+}
+
+testrun 'http://localhost:8080'
+
+rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives
+changetohttpswebserver
+
+testrun 'https://localhost:4433'