Fix the test suite again

[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 b7ccd6cf3207a3ea03e5c5273529b43a6809e5db..7347f7d10ebb3eb82a7aa87fbf6ad5f976a72579 100755 (executable)
--- a/test/integration/test-apt-update-unauth
+++ b/test/integration/test-apt-update-unauth
@@ -16,7 +16,7 @@ configarchitecture "i386"
 insertpackage 'unstable' 'foo' 'all' '1.0'
 insertsource 'unstable' 'foo' 'all' '1.0'
 
 insertpackage 'unstable' 'foo' 'all' '1.0'
 insertsource 'unstable' 'foo' 'all' '1.0'
 

-setupaptarchive
+setupaptarchive --no-update

 changetowebserver
 
 # FIXME: 
 changetowebserver
 
 # FIXME: 


@@ -24,13 +24,10 @@ changetowebserver
 #    reverified
 runtest() {
     # start unauthenticated
 #    reverified
 runtest() {
     # start unauthenticated

-    find rootdir/var/lib/apt/lists/ -type f | xargs rm -f
-    rm -f aptarchive/dists/unstable/*Release*
+    rm -rf rootdir/var/lib/apt/lists/
+    find aptarchive/ -name '*Release*' -delete

 
 

-    testsuccess aptget update -qq --allow-insecure-repositories
-
-    # FIXME: this really shouldn't be needed
-    rm -f rootdir/var/lib/apt/lists/partial/*
+    testwarning aptget update --allow-insecure-repositories

 
     # become authenticated
     generatereleasefiles
 
     # become authenticated
     generatereleasefiles


@@ -45,14 +42,14 @@ runtest() {
     # change the local packages file
     PKGS=$(ls rootdir/var/lib/apt/lists/*Packages*)
     echo "meep" > $PKGS
     # change the local packages file
     PKGS=$(ls rootdir/var/lib/apt/lists/*Packages*)
     echo "meep" > $PKGS

-    ls rootdir/var/lib/apt/lists/ > lists.before
+    listcurrentlistsdirectory > lists.before

 
     # update and ensure all is reverted on the hashsum failure
     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
     msgtest 'Check rollback on going from' 'unauth -> auth'
 
     # update and ensure all is reverted on the hashsum failure
     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
     msgtest 'Check rollback on going from' 'unauth -> auth'

-    ls rootdir/var/lib/apt/lists/ > lists.after
+    listcurrentlistsdirectory > lists.after

     if cmp lists.before lists.after; then
         msgpass
     else
     if cmp lists.before lists.after; then
         msgpass
     else