diff options
author | Julian Andres Klode <jak@debian.org> | 2017-06-28 19:15:41 +0200 |
---|---|---|
committer | Julian Andres Klode <jak@debian.org> | 2017-06-28 19:15:41 +0200 |
commit | 11c3624ce3575076ca52350f66d4bd2e63db5d73 (patch) | |
tree | 5bdd7020c8d42e9bb502fb0bbb4c3dc85450d446 /test/integration/test-apt-https-no-redirect | |
parent | 930e2df52dc637039c1845905d79ce525faeb8ca (diff) | |
parent | 147ac0fc90d972a11f5e91521ba3d385015b5945 (diff) |
Merge branch 'feature/http-https'
Diffstat (limited to 'test/integration/test-apt-https-no-redirect')
-rwxr-xr-x | test/integration/test-apt-https-no-redirect | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/test/integration/test-apt-https-no-redirect b/test/integration/test-apt-https-no-redirect index d6c630d5f..05e97159c 100755 --- a/test/integration/test-apt-https-no-redirect +++ b/test/integration/test-apt-https-no-redirect @@ -14,7 +14,7 @@ echo 'alright' > aptarchive/working changetohttpswebserver webserverconfig 'aptwebserver::redirect::replace::/redirectme/' "http://localhost:${APTHTTPPORT}/" webserverconfig 'aptwebserver::redirect::replace::/redirectme2/' "https://localhost:${APTHTTPSPORT}/" -echo 'Dir::Bin::Methods::https+http "https";' > rootdir/etc/apt/apt.conf.d/99add-https-http-method +echo 'Dir::Bin::Methods::https+http "http";' > rootdir/etc/apt/apt.conf.d/99add-https-http-method msgtest 'download of a file works via' 'http' testsuccess --nomsg downloadfile "http://localhost:${APTHTTPPORT}/working" httpfile @@ -26,13 +26,9 @@ testfileequal httpsfile 'alright' rm -f httpfile httpsfile msgtest 'download of http file works via' 'https+http' -testsuccess --nomsg downloadfile "http://localhost:${APTHTTPPORT}/working" httpfile +testsuccess --nomsg downloadfile "https+http://localhost:${APTHTTPPORT}/working" httpfile testfileequal httpfile 'alright' - -msgtest 'download of https file works via' 'https+http' -testsuccess --nomsg downloadfile "https://localhost:${APTHTTPSPORT}/working" httpsfile -testfileequal httpsfile 'alright' -rm -f httpfile httpsfile +rm -f httpfile msgtest 'download of a file does not work if' 'https redirected to http' testfailure --nomsg downloadfile "https://localhost:${APTHTTPSPORT}/redirectme/working" redirectfile |