fix tests

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index bbdd3897ab60eb869e0b1a7dac058ff637bf656b..7ad6a794ebc9b987e7d87d0b1286e6de38d6ec6c 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1129,7 +1129,7 @@ void pkgAcqIndex::ReverifyAfterIMS(std::string const &FileName)
 void pkgAcqIndex::Done(string Message,unsigned long long Size,HashStringList const &Hashes,
                       pkgAcquire::MethodConfig *Cfg)
 {
 void pkgAcqIndex::Done(string Message,unsigned long long Size,HashStringList const &Hashes,
                       pkgAcquire::MethodConfig *Cfg)
 {

-   Item::Done(Message,Size,Hash,Cfg);
+   Item::Done(Message,Size,Hashes,Cfg);

    std::string const compExt = CompressionExtension.substr(0, CompressionExtension.find(' '));
 
    if (Decompression == true)
    std::string const compExt = CompressionExtension.substr(0, CompressionExtension.find(' '));
 
    if (Decompression == true)

diff --git a/test/integration/test-apt-progress-fd b/test/integration/test-apt-progress-fd
index c147c4517aaf167c8362c236f425a913dd23a7ca..af022f58238009a841c7016e76c064a52d94200f 100755 (executable)
--- 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
 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)
 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 fbcd473ccb70cdb96167d58b02451dbb852daa26..e6332dc3b96999e3371c293ca12a4490a9e0d8a0 100755 (executable)
--- 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'
 
 
 insertpackage 'unstable' 'foo' 'all' '1.0'
 

-umask 022

 setupaptarchive --no-update
 
 # ensure the archive is not writable
 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' ')"
 # 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
 
 # foo is still available
 testsuccess aptget install -s foo
 
 # the cleanup should still work
 chmod 750 aptarchive/dists/unstable/main/binary-amd64

+
+