summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-09-23 15:49:05 +0200
committerMichael Vogt <mvo@ubuntu.com>2014-09-23 15:49:05 +0200
commita944ebe7e17d4f7fdb6540babe5bb2b71cc84053 (patch)
tree951be6d719d2b0dcdf0186e25bd3c75866cbe921
parentdb1d1c32149177c0b6ca49e5107ab1f5fd364660 (diff)
parenta1380a5c52062b25c9ed260b721239ed57929503 (diff)
Merge remote-tracking branch 'debian/debian/experimental' into feature/acq-trans
-rwxr-xr-xtest/integration/test-apt-progress-fd2
-rwxr-xr-xtest/integration/test-apt-update-file5
2 files changed, 4 insertions, 3 deletions
diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd
index c147c4517..af022f582 100755
--- a/test/integration/test-apt-progress-fd
+++ b/test/integration/test-apt-progress-fd
@@ -46,7 +46,7 @@ pmstatus:testing:100:Installed testing (amd64)" cat apt-progress.log
exec 3> apt-progress.log
testsuccess aptget install testing=0.8.15 --reinstall -y -o APT::Status-Fd=3
testequal "dlstatus:1:0:Retrieving file 1 of 1
-dlstatus:1:0:Retrieving file 1 of 1
+dlstatus:1:20:Retrieving file 1 of 1
pmstatus:dpkg-exec:0:Running dpkg
pmstatus:testing:0:Installing testing (amd64)
pmstatus:testing:20:Preparing testing (amd64)
diff --git a/test/integration/test-apt-update-file b/test/integration/test-apt-update-file
index fbcd473cc..e6332dc3b 100755
--- a/test/integration/test-apt-update-file
+++ b/test/integration/test-apt-update-file
@@ -14,7 +14,6 @@ configcompression 'bz2' 'gz'
insertpackage 'unstable' 'foo' 'all' '1.0'
-umask 022
setupaptarchive --no-update
# ensure the archive is not writable
@@ -27,10 +26,12 @@ aptget update -qq -o Debug::pkgAcquire::Auth=1 2> output.log
# 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' ')"
-grep -q "RecivedHash: $canary" output.log
+grep -q -- "- $canary" output.log
# foo is still available
testsuccess aptget install -s foo
# the cleanup should still work
chmod 750 aptarchive/dists/unstable/main/binary-amd64
+
+