tests: support spaces in path and TMPDIR

[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 aea340203c0230663f07ead866c6f27cc2c4045f..e24ee6b4487d72f9f9c48d41ccef2d858ab13a3b 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"
 


@@ -12,8 +12,8 @@ setupflataptarchive
 
 testaptgetupdate() {
        rm -rf rootdir/var/lib/apt
 
 testaptgetupdate() {
        rm -rf rootdir/var/lib/apt

-       aptget update 2>> testaptgetupdate.diff >> testaptgetupdate.diff || true
-       sed -i -e '/^Fetched / d' -e '/Ign / d' -e '/Release/ d' -e 's#Get:[0-9]\+ #Get: #' -e 's#\[[0-9]* [kMGTPY]*B\]#\[\]#' testaptgetupdate.diff
+       aptget update >testaptgetupdate.diff 2>&1 || true
+       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 $*"


@@ -27,9 +27,6 @@ testaptgetupdate() {
 
 createemptyarchive() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
 
 createemptyarchive() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete

-       if [ "en" = "$1" ]; then
-               echo -n "" | $COMPRESSOR_CMD > aptarchive/Packages.$COMPRESS
-       fi

        touch aptarchive/Packages
        echo -n "" | $COMPRESSOR_CMD > aptarchive/${1}.$COMPRESS
        generatereleasefiles
        touch aptarchive/Packages
        echo -n "" | $COMPRESSOR_CMD > aptarchive/${1}.$COMPRESS
        generatereleasefiles


@@ -39,9 +36,6 @@ createemptyarchive() {
 
 createemptyfile() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete
 
 createemptyfile() {
        find aptarchive/ \( -name "Packages*" -o -name "en*" \) -type f -delete

-       if [ "en" = "$1" ]; then
-               echo -n "" | $COMPRESSOR_CMD > aptarchive/Packages.$COMPRESS
-       fi

        touch aptarchive/Packages aptarchive/${1}.$COMPRESS
        generatereleasefiles
        signreleasefiles
        touch aptarchive/Packages aptarchive/${1}.$COMPRESS
        generatereleasefiles
        signreleasefiles


@@ -49,51 +43,36 @@ createemptyfile() {
 }
 
 testoverfile() {
 }
 
 testoverfile() {

+       local APTARCHIVE="$(readlink -f ./aptarchive)"

        forcecompressor "$1"
 
        forcecompressor "$1"
 

-       createemptyfile 'en'
-       testaptgetupdate 'Reading package lists...' "empty file en.$COMPRESS over file"
-
-       createemptyarchive 'en'
-       testaptgetupdate 'Reading package lists...' "empty archive en.$COMPRESS over file"
-

        createemptyarchive 'Packages'
        createemptyarchive 'Packages'

-       # FIXME: Why omits the file transport the Packages Get line?
-       #Get:3 file:  Packages []
-       testaptgetupdate 'Reading package lists...' "empty archive Packages.$COMPRESS over file"
+       testaptgetupdate "Get:2 file:$APTARCHIVE  Packages []
+Reading package lists..." "empty archive Packages.$COMPRESS over file"

 
        createemptyfile 'Packages'
 
        createemptyfile 'Packages'

-       testaptgetupdate "Err file:  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}:$(readlink -f aptarchive/Packages.$COMPRESS)  Empty files can't be valid archives
-
+Reading package lists...
+W: Failed to fetch ${COMPRESSOR}:${APTARCHIVE}/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"
 }
 
 testoverhttp() {
        forcecompressor "$1"
 
 E: Some index files failed to download. They have been ignored, or old ones used instead." "empty file Packages.$COMPRESS over file"
 }
 
 testoverhttp() {
        forcecompressor "$1"
 

-       createemptyfile 'en'
-       testaptgetupdate "Get: http://localhost:8080  Packages []
-Get: http://localhost:8080  Translation-en
-Reading package lists..." "empty file en.$COMPRESS over http"
-
-       createemptyarchive 'en'
-       testaptgetupdate "Get: http://localhost:8080  Packages []
-Get: http://localhost:8080  Translation-en []
-Reading package lists..." "empty archive en.$COMPRESS over http"
-

        createemptyarchive 'Packages'
        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 ${COMPRESSOR}:$(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"
 }