The entire concept of PendingError() is flawed :/.

[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 c2c5b388797d57c9aea4ee0b778fb128859605e8..4d4c33286478631f31f2ab815f3371f2732d1166 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
 
 #!/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'


@@ -27,7 +27,7 @@ testsuccess aptget update
 testsuccess aptcache show foo
 testsuccess aptget install foo -s
 
 testsuccess aptcache show foo
 testsuccess aptget install foo -s
 

-for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.log); do
+for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.log.client*.log); do

        msgmsg 'Test hashsum mismatch with file' "$get"
        rm -rf rootdir/var/lib/apt/lists
        webserverconfig 'aptwebserver::overwrite' ''
        msgmsg 'Test hashsum mismatch with file' "$get"
        rm -rf rootdir/var/lib/apt/lists
        webserverconfig 'aptwebserver::overwrite' ''


@@ -35,7 +35,7 @@ for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.
 
        testfailure aptget update
        cp rootdir/tmp/testfailure.output rootdir/tmp/update.output
 
        testfailure aptget update
        cp rootdir/tmp/testfailure.output rootdir/tmp/update.output

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