X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/0efb29eb36184bbe6de7b1013d1898796d94b171..9bd2313a5c7523501bcec398877489c5a1fc1415:/test/integration/test-bug-595691-empty-and-broken-archive-files?ds=sidebyside

diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index 0c02aee30..c216918c5 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 setupenvironment
 configarchitecture "i386"
 
@@ -54,7 +54,8 @@ Reading package lists..." "empty archive Packages.$COMPRESS over file"
 	testaptgetupdate "Get:2 file:$APTARCHIVE  Packages
 Err:2 file:$APTARCHIVE  Packages
   Empty files can't be valid archives
-W: Failed to fetch ${COMPRESSOR}:${APTARCHIVE}/Packages.$COMPRESS  Empty files can't be valid archives
+Reading package lists...
+W: Failed to fetch store:$(readlink -f rootdir/var/lib/apt/lists/partial/$(echo "$APTARCHIVE" | sed -e 's#/#_#g')_Packages.${COMPRESS})  Empty files can't be valid archives
 E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
 }
 
@@ -62,15 +63,16 @@ testoverhttp() {
 	forcecompressor "$1"
 
 	createemptyarchive 'Packages'
-	testaptgetupdate "Get:2 http://localhost:8080  Packages []
+	testaptgetupdate "Get:2 http://localhost:${APTHTTPPORT}  Packages []
 Reading package lists..." "empty archive Packages.$COMPRESS over http"
 
 	createemptyfile 'Packages'
 	#FIXME: we should response with a good error message instead
-	testaptgetupdate "Get:2 http://localhost:8080  Packages
-Err:2 http://localhost:8080  Packages
+	testaptgetupdate "Get:2 http://localhost:${APTHTTPPORT}  Packages
+Err:2 http://localhost:${APTHTTPPORT}  Packages
   Empty files can't be valid archives
-W: Failed to fetch ${COMPRESSOR}:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:8080_Packages.${COMPRESS})  Empty files can't be valid archives
+Reading package lists...
+W: Failed to fetch store:$(readlink -f rootdir/var/lib/apt/lists/partial/localhost:${APTHTTPPORT}_Packages.${COMPRESS})  Empty files can't be valid archives
 E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
 }