handle gpgv's weak-digests ERRSIG

[apt.git] / test / integration / test-apt-update-expected-size

diff --git a/test/integration/test-apt-update-expected-size b/test/integration/test-apt-update-expected-size
index 55bba81885f0b045c2fca0084114aaa04cb59b90..4981e72c3510ff7464dbaa449b3816febbaf034a 100755 (executable)
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -1,13 +1,13 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture "i386"
 
-insertpackage 'unstable' 'apt' 'all' '1.0'
+insertpackage 'unstable' 'apt' 'i386' '1.0'
 
 setupaptarchive --no-update
 cp -a aptarchive/dists aptarchive/dists.good
@@ -26,7 +26,9 @@ test_inreleasetoobig() {
 }
 
 test_packagestoobig() {
-       redatereleasefiles '+1hour'
+       insertpackage 'unstable' 'foo' 'i386' '1.0'
+       buildaptarchivefromfiles '+1 hour'
+       signreleasefiles
        # append junk at the end of the Packages.gz/Packages
        SIZE="$(stat --printf=%s aptarchive/dists/unstable/main/binary-i386/Packages)"
        find aptarchive/dists -name 'Packages*' | while read pkg; do
@@ -34,7 +36,7 @@ test_packagestoobig() {
                touch -d '+1hour' "$pkg"
        done
        NEW_SIZE="$(stat --printf=%s aptarchive/dists/unstable/main/binary-i386/Packages)"
-       testfailuremsg "W: Failed to fetch ${1}/dists/unstable/main/binary-i386/Packages  Writing more data than expected ($NEW_SIZE > $SIZE)
+       testfailuremsg "E: Failed to fetch ${1}/dists/unstable/main/binary-i386/Packages  Writing more data than expected ($NEW_SIZE > $SIZE)
 E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::Transaction=0
 }
 
@@ -69,7 +71,7 @@ methodtest() {
 }
 
 changetowebserver
-methodtest 'http://localhost:8080'
+methodtest "http://localhost:${APTHTTPPORT}"
 
 changetohttpswebserver
-methodtest 'https://localhost:4433'
+methodtest "https://localhost:${APTHTTPSPORT}"