correct cross & disappear progress detection

[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 22de13ea5ec704991eddc2a5bd78ded4641a32c3..f7b825d98cf1f5673e8ce68f31aeec7fc1f1bf1e 100755 (executable)
--- a/test/integration/test-apt-update-expected-size
+++ b/test/integration/test-apt-update-expected-size
@@ -1,14 +1,16 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
-configarchitecture "i386"
+configarchitecture 'i386'
+configcompression '.' 'gz'
 
-insertpackage 'unstable' 'apt' 'all' '1.0'
+insertpackage 'unstable' 'apt' 'i386' '1.0'
 
+export APT_DONT_SIGN=''
 setupaptarchive --no-update
 cp -a aptarchive/dists aptarchive/dists.good
 
@@ -26,18 +28,25 @@ test_inreleasetoobig() {
 }
 
 test_packagestoobig() {
+       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)"
+       SIZE="$(stat --printf=%s aptarchive/dists/unstable/main/binary-i386/Packages.gz)"
        find aptarchive/dists -name 'Packages*' | while read pkg; do
                echo "1234567890" >> "$pkg"
                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)
-E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -o Debug::pkgAcquire::Worker=0
+       NEW_SIZE="$(stat --printf=%s aptarchive/dists/unstable/main/binary-i386/Packages.gz)"
+       testfailuremsg "E: Failed to fetch ${1}/dists/unstable/main/binary-i386/Packages.gz  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
 }
 
 methodtest() {
+       # less complicated test setup this way
+       webserverconfig 'aptwebserver::support::modified-since' 'false' "$1"
+       webserverconfig 'aptwebserver::support::last-modified' 'false' "$1"  # curl is clever and sees hits here also
+
        msgmsg 'Test with' "$1" 'and clean start'
        rm -rf rootdir/var/lib/apt/lists rootdir/var/lib/apt/lists.good
        # normal update works fine
@@ -64,7 +73,7 @@ methodtest() {
 }
 
 changetowebserver
-methodtest 'http://localhost:8080'
+methodtest "http://localhost:${APTHTTPPORT}"
 
 changetohttpswebserver
-methodtest 'https://localhost:4433'
+methodtest "https://localhost:${APTHTTPSPORT}"