rework hashsum verification in the acquire system

[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 b484c5161645d36a03a456b7f74a3a426101ee62..f78b83b5ff6d1ca858fbe303db948e810235ff49 100755 (executable)
--- a/test/integration/test-apt-update-filesize-mismatch
+++ b/test/integration/test-apt-update-filesize-mismatch
@@ -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
+               testfailure aptget update -o Debug::pkgAcquire::Worker=1
+               cp rootdir/tmp/testfailure.output rootdir/tmp/update.output

                testsuccess grep -E "$(basename -s '.gz' "$COMPRESSFILE").*Hash Sum mismatch" 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 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