test-apt-cdrom: Fix for gnupg 2.1.15

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

diff --git a/test/integration/test-apt-update-hashsum-mismatch b/test/integration/test-apt-update-hashsum-mismatch
index 747418c53872d7ea3b00071f9997646f3fc74833..f3f6a42367ad03cafef174c5011e925f7a32b204 100755 (executable)
--- a/test/integration/test-apt-update-hashsum-mismatch
+++ b/test/integration/test-apt-update-hashsum-mismatch
@@ -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'
 configcompression 'gz'
@@ -33,16 +33,11 @@ for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.
        webserverconfig 'aptwebserver::overwrite' ''
        webserverconfig "aptwebserver::overwrite::$(printf '%s' "${get}" | sed 's#/#%2F#g' )::filename" '%2FDoctorEvil.gz'
 
-       TEST='testfailure'
-       if expr match "$get" '^.*Translation-.*$' >/dev/null; then
-               TEST='testsuccess'
-               unset get
-       fi
-       $TEST aptget update
-       cp rootdir/tmp/${TEST}.output rootdir/tmp/update.output
-       testsuccess grep -E "$(basename -s '.gz' "$get").*Hash Sum mismatch" rootdir/tmp/update.output
-       $TEST aptcache show foo
-       $TEST aptget install foo -s
+       testfailure aptget update
+       cp rootdir/tmp/testfailure.output rootdir/tmp/update.output
+       testsuccess grep -E "$(basename "$get" '.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