From 6c0765c096ffb4df14169236c865bbb2b10974ae Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 15 Sep 2015 00:33:12 +0200 Subject: tests: don't use hardcoded port for http and https This allows running tests in parallel. Git-Dch: Ignore --- test/integration/test-apt-https-no-redirect | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/integration/test-apt-https-no-redirect') diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect index c91c78916..a29c0dacf 100755 --- a/test/integration/test-apt-https-no-redirect +++ b/test/integration/test-apt-https-no-redirect @@ -11,18 +11,18 @@ insertpackage 'stable' 'apt' 'all' '1' setupaptarchive --no-update echo 'alright' > aptarchive/working -changetohttpswebserver -o 'aptwebserver::redirect::replace::/redirectme/=http://localhost:8080/' +changetohttpswebserver -o "aptwebserver::redirect::replace::/redirectme/=http://localhost:${APTHTTPPORT}/" msgtest 'download of a file works via' 'http' -testsuccess --nomsg downloadfile 'http://localhost:8080/working' httpfile +testsuccess --nomsg downloadfile "http://localhost:${APTHTTPPORT}/working" httpfile testfileequal httpfile 'alright' msgtest 'download of a file works via' 'https' -testsuccess --nomsg downloadfile 'https://localhost:4433/working' httpsfile +testsuccess --nomsg downloadfile "https://localhost:${APTHTTPSPORT}/working" httpsfile testfileequal httpsfile 'alright' msgtest 'download of a file does not work if' 'https redirected to http' -testfailure --nomsg downloadfile 'https://localhost:4433/redirectme/working' redirectfile +testfailure --nomsg downloadfile "https://localhost:${APTHTTPSPORT}/redirectme/working" redirectfile msgtest 'libcurl has forbidden access in last request to' 'http resource' testsuccess --nomsg grep -q -E -- 'Protocol "?http"? not supported or disabled in libcurl' rootdir/tmp/testfailure.output -- cgit v1.2.3-70-g09d2