ignore Acquire::GzipIndexes for cdrom sources

[apt.git] / test / integration / test-apt-update-unauth

diff --git a/test/integration/test-apt-update-unauth b/test/integration/test-apt-update-unauth
index 4e08b5e355db7b5cade5e2400f4177877a646905..b7ccd6cf3207a3ea03e5c5273529b43a6809e5db 100755 (executable)
--- a/test/integration/test-apt-update-unauth
+++ b/test/integration/test-apt-update-unauth
@@ -8,6 +8,8 @@ set -e
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 
+umask 022
+
 setupenvironment
 configarchitecture "i386"
 
@@ -24,34 +26,46 @@ runtest() {
     # start unauthenticated
     find rootdir/var/lib/apt/lists/ -type f | xargs rm -f
     rm -f aptarchive/dists/unstable/*Release*
-    # remove uncompressed version
-    find aptarchive/ -name Packages | xargs rm -f
-    aptget update -qq
+
+    testsuccess aptget update -qq --allow-insecure-repositories
+
+    # FIXME: this really shouldn't be needed
+    rm -f rootdir/var/lib/apt/lists/partial/*
 
     # become authenticated
     generatereleasefiles
     signreleasefiles
 
+    # move uncompressed away
+    mv aptarchive/dists/unstable/main/binary-i386/Packages \
+        aptarchive/dists/unstable/main/binary-i386/Packages.uncompressed
+
     # and ensure we re-check the downloaded data
-    msgtest "Check rollback on going from unauth -> auth"
 
     # change the local packages file
     PKGS=$(ls rootdir/var/lib/apt/lists/*Packages*)
     echo "meep" > $PKGS
-    ls -l rootdir/var/lib/apt/lists > lists.before
+    ls rootdir/var/lib/apt/lists/ > lists.before
 
     # update and ensure all is reverted on the hashsum failure
-    aptget update -o Debug::Acquire::Transaction=1 -o Debug::pkgAcquire::Auth=1 -o Debug::pkgAcquire::worker=0 > output.log 2>&1 || true
+    testfailure aptget update -o Debug::Acquire::Transaction=0 -o Debug::pkgAcquire::Auth=1 -o Debug::pkgAcquire::worker=0 -o Debug::acquire::http=0
 
     # ensure we have before what we have after
-    ls -l rootdir/var/lib/apt/lists > lists.after
-    if diff -u lists.before lists.after; then
+    msgtest 'Check rollback on going from' 'unauth -> auth'
+    ls rootdir/var/lib/apt/lists/ > lists.after
+    if cmp lists.before lists.after; then
         msgpass
     else
-        #cat output.log
-        msgfail
+       echo >&2 '### Output of previous apt-get update ###'
+       cat >&2 rootdir/tmp/testfailure.output
+       echo >&2 '### Changes in the lists-directory: ###'
+       diff -u >&2 lists.before lists.after
+       msgfail
     fi
 
+    # move uncompressed back for release file
+    mv aptarchive/dists/unstable/main/binary-i386/Packages.uncompressed \
+        aptarchive/dists/unstable/main/binary-i386/Packages
 }
 
 for COMPRESSEDINDEXES in 'false' 'true'; do
@@ -61,6 +75,5 @@ for COMPRESSEDINDEXES in 'false' 'true'; do
        else
                msgmsg 'Run tests with GzipIndexes disabled'
        fi
-
-        runtest
+       runtest
 done