cleanup around pkgAcqMetaSig and improved tests

[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 13487603cd04858bae2e432f44dea503a22138b3..cf51950243745b1713b2307f9b66365f33e949df 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
 
 TESTDIR=$(readlink -f $(dirname $0))
 . $TESTDIR/framework
 

+umask 022
+

 setupenvironment
 configarchitecture "i386"
 
 setupenvironment
 configarchitecture "i386"
 


@@ -17,23 +19,50 @@ insertsource 'unstable' 'foo' 'all' '1.0'
 setupaptarchive
 changetowebserver
 
 setupaptarchive
 changetowebserver
 

+# FIXME: 
+#  - also check the unauth -> auth success case, i.e. that all files are
+#    reverified

 runtest() {
     # start unauthenticated
     find rootdir/var/lib/apt/lists/ -type f | xargs rm -f
     rm -f aptarchive/dists/unstable/*Release*
 runtest() {
     # start unauthenticated
     find rootdir/var/lib/apt/lists/ -type f | xargs rm -f
     rm -f aptarchive/dists/unstable/*Release*

-    aptget update -qq
+
+    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
 
 
     # become authenticated
     generatereleasefiles
     signreleasefiles
 

-    # and ensure we do download the data again
-    msgtest "Check that the data is check when going to authenticated"
-    if aptget update |grep -q Hit; then
-        msgfail
-    else
+    # 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 rootdir/var/lib/apt/lists/ > lists.before
+
+    # update and ensure all is reverted on the hashsum failure
+    aptget update -o Debug::Acquire::Transaction=0 -o Debug::pkgAcquire::Auth=1 -o Debug::pkgAcquire::worker=0 -o Debug::acquire::http=0 > output.log 2>&1 || true
+
+    # ensure we have before what we have after
+    ls rootdir/var/lib/apt/lists/ > lists.after
+    if diff -u lists.before lists.after; then

         msgpass
         msgpass

+    else
+        cat output.log
+        msgfail

     fi
     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
 }
 
 for COMPRESSEDINDEXES in 'false' 'true'; do