don't ask server if we have entire file in partial/

[apt.git] / test / integration / test-apt-update-filesize-mismatch

diff --git a/test/integration/test-apt-update-filesize-mismatch b/test/integration/test-apt-update-filesize-mismatch
index 8c73c059eaa932825d5d545a6ac09c67d0f109b4..9f95906b5ab135d252b313e353a32be4ee208e24 100755 (executable)
--- a/test/integration/test-apt-update-filesize-mismatch
+++ b/test/integration/test-apt-update-filesize-mismatch
@@ -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'
 configcompression 'gz'
 setupenvironment
 configarchitecture 'i386'
 configcompression 'gz'


@@ -28,7 +28,7 @@ for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.
        for ext in '' '.gz'; do
                COMPRESSFILE="$get"
                get="${get}${ext}"
        for ext in '' '.gz'; do
                COMPRESSFILE="$get"
                get="${get}${ext}"

-               FILE="$(basename -s '.gz' "$get")"
+               FILE="$(basename "$get" '.gz')"

                msgmsg 'Test filesize mismatch with file' "$FILE"
                rm -rf rootdir/var/lib/apt/lists
 
                msgmsg 'Test filesize mismatch with file' "$FILE"
                rm -rf rootdir/var/lib/apt/lists
 


@@ -38,16 +38,11 @@ for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.
                done
                signreleasefiles
 
                done
                signreleasefiles
 

-               TEST='testfailure'
-               if expr match "$COMPRESSFILE" '^.*Translation-.*$' >/dev/null; then
-                       TEST='testsuccess'
-                       unset COMPRESSFILE
-               fi
-               $TEST aptget update -o Debug::pkgAcquire::Worker=1
-               cp rootdir/tmp/${TEST}.output rootdir/tmp/update.output
-               testsuccess grep -E "$(basename -s '.gz' "$COMPRESSFILE").*Hash Sum mismatch" rootdir/tmp/update.output
-               $TEST aptcache show foo
-               $TEST aptget install foo -s
+               testfailure aptget update -o Debug::pkgAcquire::Worker=1
+               cp rootdir/tmp/testfailure.output rootdir/tmp/update.output
+               testsuccess grep -E "$(basename "$COMPRESSFILE" '.gz').*Hash Sum mismatch" rootdir/tmp/update.output
+               testfailure aptcache show foo
+               testfailure aptget install foo -s

 
                testfailure aptcache show bar
                testfailure aptget install bar -s
 
                testfailure aptcache show bar
                testfailure aptget install bar -s