Merge branch 'debian/experimental' into feature/srv-records

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

diff --git a/test/integration/test-apt-update-stale b/test/integration/test-apt-update-stale
index 780ff79afd9a9ac7a012e54d4c87339089e31dfd..05154641a253190301d44053fa8bdfb2cd30a12b 100755 (executable)
--- a/test/integration/test-apt-update-stale
+++ b/test/integration/test-apt-update-stale
@@ -14,9 +14,12 @@ configarchitecture "i386"
 
 insertpackage 'unstable' 'foo' 'all' '1.0'
 
 
 insertpackage 'unstable' 'foo' 'all' '1.0'
 

-setupaptarchive
+setupaptarchive --no-update

 changetowebserver
 changetowebserver

-aptget update -qq
+
+echo "Acquire::Languages \"none\";" > rootdir/etc/apt/apt.conf.d/00nolanguages
+testsuccess aptget update
+listcurrentlistsdirectory > lists.before

 
 # insert new version
 mkdir aptarchive/dists/unstable/main/binary-i386/saved
 
 # insert new version
 mkdir aptarchive/dists/unstable/main/binary-i386/saved


@@ -24,23 +27,19 @@ cp -p aptarchive/dists/unstable/main/binary-i386/Packages* \
      aptarchive/dists/unstable/main/binary-i386/saved
 insertpackage 'unstable' 'foo' 'all' '2.0'
 
      aptarchive/dists/unstable/main/binary-i386/saved
 insertpackage 'unstable' 'foo' 'all' '2.0'
 

-# not using compressfile for compat with older apt releases
-gzip -c aptarchive/dists/unstable/main/binary-i386/Packages > \
-  aptarchive/dists/unstable/main/binary-i386/Packages.gz
-generatereleasefiles
-signreleasefiles
-
+compressfile aptarchive/dists/unstable/main/binary-i386/Packages

 # ensure that we do not get a I-M-S hit for the Release file
 # ensure that we do not get a I-M-S hit for the Release file

-touch -d "+1hour" aptarchive/dists/unstable/*Release*
+
+generatereleasefiles '+1hour'
+signreleasefiles

 
 # but now only deliver the previous Packages file instead of the new one
 # (simulating a stale attack)
 cp -p aptarchive/dists/unstable/main/binary-i386/saved/Packages* \
      aptarchive/dists/unstable/main/binary-i386/
 
 
 # but now only deliver the previous Packages file instead of the new one
 # (simulating a stale attack)
 cp -p aptarchive/dists/unstable/main/binary-i386/saved/Packages* \
      aptarchive/dists/unstable/main/binary-i386/
 

-# ensure this raises a error
-testequal "W: Failed to fetch http://localhost:8080/dists/unstable/main/binary-i386/Packages  Hash Sum mismatch
+# ensure this raises an error
+testfailureequal "W: Failed to fetch http://localhost:8080/dists/unstable/main/binary-i386/Packages  Hash Sum mismatch

 
 E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq
 
 E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update -qq

-
-
+testfileequal lists.before "$(listcurrentlistsdirectory)"