test-apt-download-progress: Allow smaller progress change

[apt.git] / 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 73352a28cac1b2977ff9c3fd0949a589d88c1a52..a29c0dacf8760d4a2397209783c801ea77f9a61b 100755 (executable)
--- a/test/integration/test-apt-https-no-redirect
+++ b/test/integration/test-apt-https-no-redirect
@@ -11,20 +11,18 @@ insertpackage 'stable' 'apt' 'all' '1'
 setupaptarchive --no-update
 
 echo 'alright' > aptarchive/working
 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'
 
 msgtest 'download of a file works via' 'http'

-downloadfile 'http://localhost:8080/working' httpfile >/dev/null 2>&1 && msgpass || msgfail
+testsuccess --nomsg downloadfile "http://localhost:${APTHTTPPORT}/working" httpfile

 testfileequal httpfile 'alright'
 
 msgtest 'download of a file works via' 'https'
 testfileequal httpfile 'alright'
 
 msgtest 'download of a file works via' 'https'

-downloadfile 'https://localhost:4433/working' httpsfile >/dev/null 2>&1 && msgpass || msgfail
+testsuccess --nomsg downloadfile "https://localhost:${APTHTTPSPORT}/working" httpsfile

 testfileequal httpsfile 'alright'
 
 msgtest 'download of a file does not work if' 'https redirected to http'
 testfileequal httpsfile 'alright'
 
 msgtest 'download of a file does not work if' 'https redirected to http'

-downloadfile 'https://localhost:4433/redirectme/working' redirectfile >curloutput 2>&1 && msgfail || msgpass
+testfailure --nomsg downloadfile "https://localhost:${APTHTTPSPORT}/redirectme/working" redirectfile

 
 msgtest 'libcurl has forbidden access in last request to' 'http resource'
 
 msgtest 'libcurl has forbidden access in last request to' 'http resource'

-grep -q -- 'Protocol http not supported or disabled in libcurl' curloutput && msgpass || msgfail
-
-
+testsuccess --nomsg grep -q -E -- 'Protocol "?http"? not supported or disabled in libcurl' rootdir/tmp/testfailure.output