Merge branch 'debian/sid' into debian/experimental

[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 e6332dc3b96999e3371c293ca12a4490a9e0d8a0..1ecf9a38a2a9da4bb60e0d47149e9480fbe13230 100755 (executable)
--- a/test/integration/test-apt-update-file
+++ b/test/integration/test-apt-update-file
@@ -10,28 +10,26 @@ TESTDIR=$(readlink -f $(dirname $0))
 
 setupenvironment
 configarchitecture "amd64"
 
 setupenvironment
 configarchitecture "amd64"

-configcompression 'bz2' 'gz' 
+configcompression 'bz2' 'gz'

 
 

-insertpackage 'unstable' 'foo' 'all' '1.0'
+insertpackage 'unstable' 'foo' 'all' '1'
+insertsource 'unstable' 'foo' 'all' '1'

 
 setupaptarchive --no-update
 
 # ensure the archive is not writable
 
 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
 
 chmod 550 aptarchive/dists/unstable/main/binary-amd64
 

-testsuccess aptget update -qq
-testsuccess aptget update -qq
-aptget update -qq -o Debug::pkgAcquire::Auth=1 2> output.log
+testsuccess aptget update
+testsuccess aptget update -o Debug::pkgAcquire::Auth=1
+cp -a rootdir/tmp/testsuccess.output rootdir/tmp/update.output

 
 

-# ensure that the hash of the uncompressed file was verified even on a local 
-# ims hit
+# 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' ')"
 canary="SHA512:$(bzcat aptarchive/dists/unstable/main/binary-amd64/Packages.bz2 | sha512sum |cut -f1 -d' ')"

-grep -q -- "- $canary" output.log
+testsuccess grep -- "$canary" rootdir/tmp/update.output

 
 # foo is still available
 testsuccess aptget install -s foo
 
 # foo is still available
 testsuccess aptget install -s foo

-
-# the cleanup should still work
-chmod 750 aptarchive/dists/unstable/main/binary-amd64
-
-
+testsuccess aptcache showsrc foo
+testsuccess aptget source foo --print-uris