use one 'store' method to rule all (de)compressors

[apt.git] / test / integration / test-bug-595691-empty-and-broken-archive-files

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 3042d116d5211821c3b0a2d08f19539b270119b4..c216918c5fcaf6602aa075f6e31e2387148b324a 100755 (executable)
--- 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
 
 #!/bin/sh
 set -e
 

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

 setupenvironment
 configarchitecture "i386"
 
 setupenvironment
 configarchitecture "i386"
 


@@ -13,7 +13,7 @@ setupflataptarchive
 testaptgetupdate() {
        rm -rf rootdir/var/lib/apt
        aptget update >testaptgetupdate.diff 2>&1 || true
 testaptgetupdate() {
        rm -rf rootdir/var/lib/apt
        aptget update >testaptgetupdate.diff 2>&1 || true

-       sed -i -e '/Ign /,+1d' -e '/Release/ d' -e 's#Get:[0-9]\+ #Get: #' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
+       sed -i -e '/Ign /,+1d' -e '/Release/ d' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff

        GIVEN="$1"
        shift
        msgtest "Test for correctness of" "apt-get update with $*"
        GIVEN="$1"
        shift
        msgtest "Test for correctness of" "apt-get update with $*"


@@ -47,15 +47,15 @@ testoverfile() {
        forcecompressor "$1"
 
        createemptyarchive 'Packages'
        forcecompressor "$1"
 
        createemptyarchive 'Packages'

-       testaptgetupdate "Get: file:$APTARCHIVE  Packages []
+       testaptgetupdate "Get:2 file:$APTARCHIVE  Packages []

 Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
        createemptyfile 'Packages'
 Reading package lists..." "empty archive Packages.$COMPRESS over file"
 
        createemptyfile 'Packages'

-       testaptgetupdate "Get: file:$APTARCHIVE  Packages
-Err file:$APTARCHIVE  Packages
+       testaptgetupdate "Get:2 file:$APTARCHIVE  Packages
+Err:2 file:$APTARCHIVE  Packages

   Empty files can't be valid archives
   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"
 }
 
 E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
 }
 


@@ -63,16 +63,16 @@ testoverhttp() {
        forcecompressor "$1"
 
        createemptyarchive 'Packages'
        forcecompressor "$1"
 
        createemptyarchive 'Packages'

-       testaptgetupdate "Get: 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
 Reading package lists..." "empty archive Packages.$COMPRESS over http"
 
        createemptyfile 'Packages'
        #FIXME: we should response with a good error message instead

-       testaptgetupdate "Get: http://localhost:8080  Packages
-Err http://localhost:8080  Packages
+       testaptgetupdate "Get:2 http://localhost:${APTHTTPPORT}  Packages
+Err:2 http://localhost:${APTHTTPPORT}  Packages

   Empty files can't be valid archives
   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"
 }
 
 E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over http"
 }