show apt-key warnings in apt update

[apt.git] / test / integration / test-bug-lp1445239-download-loop

diff --git a/test/integration/test-bug-lp1445239-download-loop b/test/integration/test-bug-lp1445239-download-loop
index 342e3c61e532a0c64e6c4947f233a893307b080e..6802840a510c20aeef3be8ecd0117a25966a2a6c 100755 (executable)
--- a/test/integration/test-bug-lp1445239-download-loop
+++ b/test/integration/test-bug-lp1445239-download-loop
@@ -6,22 +6,21 @@
 
 set -e
 
 
 set -e
 

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

 setupenvironment
 configarchitecture 'amd64'
 
 changetowebserver
 setupenvironment
 configarchitecture 'amd64'
 
 changetowebserver

-webserverconfig 'aptwebserver::support::range' 'true'

 
 TESTFILE='aptarchive/testfile'
 dd if=/dev/zero of=$TESTFILE bs=100k count=1 2>/dev/null
 
 DOWNLOADLOG='rootdir/tmp/testdownloadfile.log'
 
 
 TESTFILE='aptarchive/testfile'
 dd if=/dev/zero of=$TESTFILE bs=100k count=1 2>/dev/null
 
 DOWNLOADLOG='rootdir/tmp/testdownloadfile.log'
 

-TARGET=testfile-downloaded
+TARGET=./downloaded/testfile-downloaded

 dd if=/dev/zero of=$TARGET bs=99k count=1 2>/dev/null
 dd if=/dev/zero of=$TARGET bs=99k count=1 2>/dev/null

-if ! downloadfile http://localhost:8080/testfile "$TARGET" > "$DOWNLOADLOG"; then
+if ! downloadfile http://localhost:${APTHTTPPORT}/testfile "$TARGET" > "$DOWNLOADLOG"; then

     cat >&2 "$DOWNLOADLOG"
     msgfail
 else
     cat >&2 "$DOWNLOADLOG"
     msgfail
 else