test-apt-cdrom: Fix for gnupg 2.1.15

[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 04e26a8f4c1d3e0e557653489e8b856b5535a8a9..8da4ec35b352f3c883c38c92b75bf8a17db0f864 100755 (executable)
--- a/test/integration/test-apt-update-file
+++ b/test/integration/test-apt-update-file
@@ -5,8 +5,8 @@
 #
 set -e
 
 #
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 configarchitecture "amd64"
 
 setupenvironment
 configarchitecture "amd64"


@@ -14,18 +14,39 @@ configcompression 'bz2' 'gz'
 confighashes 'SHA512'
 
 insertpackage 'unstable' 'foo' 'all' '1'
 confighashes 'SHA512'
 
 insertpackage 'unstable' 'foo' 'all' '1'

+insertpackage 'unstable' 'bar' 'amd64' '1'

 insertsource 'unstable' 'foo' 'all' '1'
 
 setupaptarchive --no-update
 insertsource 'unstable' 'foo' 'all' '1'
 
 setupaptarchive --no-update

+logcurrentarchivedirectory

 
 # ensure the archive is not writable
 addtrap 'prefix' 'chmod 755 aptarchive/dists/unstable/main/binary-all;'
 if [ "$(id -u)" = '0' ]; then
 
 # ensure the archive is not writable
 addtrap 'prefix' 'chmod 755 aptarchive/dists/unstable/main/binary-all;'
 if [ "$(id -u)" = '0' ]; then

-       chmod 550 aptarchive/dists/unstable/main/binary-all
+       # 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
        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
+       chmod 755 aptarchive/dists/
+else
+       testsuccess aptget update

 fi
 fi

+mv rootdir/var/lib/apt/lists/_* rootdir/var/lib/apt/lists/partial

 chmod 555 aptarchive/dists/unstable/main/binary-all
 chmod 555 aptarchive/dists/unstable/main/binary-all

-testsuccess aptget update
+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'
 
 # the release files aren't an IMS-hit, but the indexes are
 redatereleasefiles '+1 hour'