correct cross & disappear progress detection

[apt.git] / test / integration / test-ubuntu-bug-1078697-missing-source-hashes

diff --git a/test/integration/test-ubuntu-bug-1078697-missing-source-hashes b/test/integration/test-ubuntu-bug-1078697-missing-source-hashes
index 6fcb856b5ce8572de437f0849824a504c78924bc..0b9103f534fedc6bf525eb5ec1ae2d0c4c221396 100755 (executable)
--- a/test/integration/test-ubuntu-bug-1078697-missing-source-hashes
+++ b/test/integration/test-ubuntu-bug-1078697-missing-source-hashes
@@ -1,10 +1,11 @@
 #!/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"

+confighashes 'MD5' 'SHA1' 'SHA256' 'SHA512'

 
 msgtest 'Test apt-ftparchive source with missing hashes in .dsc'
 
 
 msgtest 'Test apt-ftparchive source with missing hashes in .dsc'
 


@@ -22,14 +23,16 @@ Files:
 EOF
 
 # check for the SHA hashes
 EOF
 
 # check for the SHA hashes

-aptftparchive sources aptarchive/ > aptarchive/Sources  2>/dev/null || msgfail
-test -n "$(grep Checksums-Sha512 aptarchive/Sources)" && msgpass || msgfail
+testsuccess aptftparchive sources aptarchive/
+cp rootdir/tmp/testsuccess.output aptarchive/Sources
+testsuccess grep Checksums-Sha512 aptarchive/Sources

 
 for hash in sha512sum sha256sum sha1sum; do
     for f in foo_1.0.tar.gz foo_1.0.dsc; do
         SUM=$($hash aptarchive/$f | cut -d' ' -f1)
 
 for hash in sha512sum sha256sum sha1sum; do
     for f in foo_1.0.tar.gz foo_1.0.dsc; do
         SUM=$($hash aptarchive/$f | cut -d' ' -f1)

-        msgtest "Test $hash hash matches for $f"

         NEEDLE="$SUM $(stat -c%s aptarchive/$f) $f"
         NEEDLE="$SUM $(stat -c%s aptarchive/$f) $f"

-        test -n "$SUM" &&  test -n "$(grep "$NEEDLE" aptarchive/Sources)" && msgpass || msgfail 
+       testsuccess test -n "$SUM"
+       msgtest "Test $hash hash matches for $f"
+       testsuccess --nomsg grep "$NEEDLE" aptarchive/Sources

     done
 done
     done
 done