test: Use :$(id -gn) instead of :root (when run as root)

[apt.git] / test / integration / test-bug-778375-server-has-no-reason-phrase

diff --git a/test/integration/test-bug-778375-server-has-no-reason-phrase b/test/integration/test-bug-778375-server-has-no-reason-phrase
index 23481ef881a3df62624460395536e1d2fb965998..28e31e0691c53e90ab8e381ba17af3af1b8a9ff9 100755 (executable)
--- a/test/integration/test-bug-778375-server-has-no-reason-phrase
+++ b/test/integration/test-bug-778375-server-has-no-reason-phrase
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 configarchitecture 'native'
 
 setupenvironment
 configarchitecture 'native'


@@ -11,6 +11,7 @@ echo 'found' > aptarchive/working
 changetohttpswebserver  -o 'aptwebserver::redirect::replace::/redirectme/=/' \
        -o 'aptwebserver::httpcode::200=200' -o 'aptwebserver::httpcode::404=404' \
        -o 'aptwebserver::httpcode::301=301'
 changetohttpswebserver  -o 'aptwebserver::redirect::replace::/redirectme/=/' \
        -o 'aptwebserver::httpcode::200=200' -o 'aptwebserver::httpcode::404=404' \
        -o 'aptwebserver::httpcode::301=301'

+webserverconfig 'aptwebserver::empty-response-header::' 'foobar'

 
 testdownload() {
        rm -f downfile
 
 testdownload() {
        rm -f downfile


@@ -36,5 +37,5 @@ runtest() {
        testdownload 'non-existent file via redirect fails' 'testfailure' "$1/redirectme/failing"
 }
 
        testdownload 'non-existent file via redirect fails' 'testfailure' "$1/redirectme/failing"
 }
 

-runtest 'http://localhost:8080'
-runtest 'https://localhost:4433'
+runtest "http://localhost:${APTHTTPPORT}"
+runtest "https://localhost:${APTHTTPSPORT}"