diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2017-07-26 19:09:59 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2017-07-26 19:09:59 +0200 |
| commit | 2920e9428e26004f90a1f1ea86f07850b2204f85 (patch) | |
| tree | 601b38dc82e987ad0ed141caa31b480e6f6fb4ca /test/integration/test-authentication-basic | |
| parent | f2f8e89f08cdf01c83a0b8ab053c65329d85ca90 (diff) | |
| parent | 8580574ec63fedd39a3ab3b9f0025e08eae5f620 (diff) | |
Merge branch 'feature/authconf'
Diffstat (limited to 'test/integration/test-authentication-basic')
| -rwxr-xr-x | test/integration/test-authentication-basic | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/test/integration/test-authentication-basic b/test/integration/test-authentication-basic index 3bfd076ce..011f205af 100755 --- a/test/integration/test-authentication-basic +++ b/test/integration/test-authentication-basic @@ -13,6 +13,7 @@ setupaptarchive --no-update changetohttpswebserver --authorization="$(printf '%s' 'star@irc:hunter2' | base64 )" echo 'See, when YOU type hunter2, it shows to us as *******' > aptarchive/bash +echo 'Debug::Acquire::netrc "true";' > rootdir/etc/apt/apt.conf.d/netrcdebug.conf testauthfailure() { testfailure apthelper download-file "${1}/bash" ./downloaded/bash @@ -37,7 +38,11 @@ testauthsuccess() { fi rm -rf rootdir/var/lib/apt/lists - testsuccess aptget update + if expr index "$1" '@' >/dev/null; then + testsuccesswithnotice aptget update + else + testsuccess aptget update + fi testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: @@ -94,7 +99,9 @@ rewritesourceslist "http://localhost:${APTHTTPPORT}" msgmsg 'proxy to server basic auth' webserverconfig 'aptwebserver::request::absolute' 'uri' -export http_proxy="http://localhost:${APTHTTPPORT}" +# using ip instead of localhost avoids picking up the auth for the repo +# for the proxy as well as we serve them both over the same server… +export http_proxy="http://127.0.0.1:${APTHTTPPORT}" runtest "http://localhost:${APTHTTPPORT}" unset http_proxy |