allow redirection for items without a space in the desc again

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

diff --git a/test/integration/test-apt-update-file b/test/integration/test-apt-update-file
index 1ecf9a38a2a9da4bb60e0d47149e9480fbe13230..20f6046957fd95b36c2da7c6349b673c52ba1964 100755 (executable)
--- a/test/integration/test-apt-update-file
+++ b/test/integration/test-apt-update-file
@@ -5,31 +5,71 @@
 #
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture "amd64"
 configcompression 'bz2' 'gz'
+confighashes 'SHA512'
 
 insertpackage 'unstable' 'foo' 'all' '1'
+insertpackage 'unstable' 'bar' 'amd64' '1'
 insertsource 'unstable' 'foo' 'all' '1'
 
 setupaptarchive --no-update
 
 # ensure the archive is not writable
-addtrap 'prefix' 'chmod 750 aptarchive/dists/unstable/main/binary-amd64;'
-chmod 550 aptarchive/dists/unstable/main/binary-amd64
+addtrap 'prefix' 'chmod 755 aptarchive/dists/unstable/main/binary-all;'
+if [ "$(id -u)" = '0' ]; then
+       # too deep to notice it, but it also unlikely that files in the same repo have different permissions
+       chmod 500 aptarchive/dists/unstable/main/binary-all
+       testfailure aptget update
+       rm -rf rootdir/var/lib/apt/lists
+       chmod 755 aptarchive/dists/unstable/main/binary-all
+       testsuccess aptget update
+       rm -rf rootdir/var/lib/apt/lists
+       chmod 511 aptarchive/dists/
+       testsuccess aptget update
+       rm -rf rootdir/var/lib/apt/lists
+       chmod 510 aptarchive/dists/
+       testsuccesswithnotice aptget update
+       rm -rf rootdir/var/lib/apt/lists
+       chmod 500 aptarchive/dists/
+       testsuccesswithnotice aptget update
+       exit
+fi
+chmod 555 aptarchive/dists/unstable/main/binary-all
+testsuccess aptget update -o Debug::pkgAcquire::Worker=1
+cp -a rootdir/tmp/testsuccess.output rootdir/tmp/update.output
+testsuccess grep '%0aAlt-Filename:%20' rootdir/tmp/update.output
+
+# the release files aren't an IMS-hit, but the indexes are
+redatereleasefiles '+1 hour'
 
-testsuccess aptget update
+# we don't download the index if it isn't updated
 testsuccess aptget update -o Debug::pkgAcquire::Auth=1
+# file:/ isn't shown in the log, so see if it was downloaded anyhow
 cp -a rootdir/tmp/testsuccess.output rootdir/tmp/update.output
+canary="SHA512:$(bzcat aptarchive/dists/unstable/main/binary-all/Packages.bz2 | sha512sum |cut -f1 -d' ')"
+testfailure grep -- "$canary" rootdir/tmp/update.output
+
+testfoo() {
+       # foo is still available
+       testsuccess aptget install -s foo
+       testsuccess aptcache showsrc foo
+       testsuccess aptget source foo --print-uris
+}
+testfoo
 
-# ensure that the hash of the uncompressed file was verified even on a local ims hit
-canary="SHA512:$(bzcat aptarchive/dists/unstable/main/binary-amd64/Packages.bz2 | sha512sum |cut -f1 -d' ')"
+# the release file is new again, the index still isn't, but it is somehow gone now from disk
+redatereleasefiles '+2 hour'
+find rootdir/var/lib/apt/lists -name '*_Packages*' -delete
+
+testsuccess aptget update -o Debug::pkgAcquire::Auth=1
+# file:/ isn't shown in the log, so see if it was downloaded anyhow
+cp -a rootdir/tmp/testsuccess.output rootdir/tmp/update.output
+canary="SHA512:$(bzcat aptarchive/dists/unstable/main/binary-all/Packages.bz2 | sha512sum |cut -f1 -d' ')"
 testsuccess grep -- "$canary" rootdir/tmp/update.output
 
-# foo is still available
-testsuccess aptget install -s foo
-testsuccess aptcache showsrc foo
-testsuccess aptget source foo --print-uris
+testfoo