Merge branch 'debian/sid' into debian/experimental

[apt.git] / test / integration / test-apt-download-progress

diff --git a/test/integration/test-apt-download-progress b/test/integration/test-apt-download-progress
index 7092e163e6fe35e439bbf5be32537cb93498f13d..65c438e8f994436703efd998ec5c36c5bbae794a 100755 (executable)
--- a/test/integration/test-apt-download-progress
+++ b/test/integration/test-apt-download-progress
@@ -13,12 +13,11 @@ changetohttpswebserver
 assertprogress() {
     T="$1"
     testsuccess grep "dlstatus:1:0:Retrieving file 1 of 1" "$T"
 assertprogress() {
     T="$1"
     testsuccess grep "dlstatus:1:0:Retrieving file 1 of 1" "$T"

-    if ! egrep -q "dlstatus:1:[0-9]{1,2}\.(.*):Retrieving file 1 of 1" "$T"; then
+    if ! egrep -q "dlstatus:1:[1-9][0-9](\..*)?:Retrieving file 1 of 1" "$T"; then

         cat "$T"
         msgfail "Failed to detect download progress"
     fi
     testsuccess grep "dlstatus:1:100:Retrieving file 1 of 1" "$T"
         cat "$T"
         msgfail "Failed to detect download progress"
     fi
     testsuccess grep "dlstatus:1:100:Retrieving file 1 of 1" "$T"

-    #cat $T

 }
 
 # we need to ensure the file is reasonable big so that apt has a chance to
 }
 
 # we need to ensure the file is reasonable big so that apt has a chance to


@@ -27,17 +26,16 @@ assertprogress() {
 TESTFILE=testfile.big
 testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=800k count=1 
 
 TESTFILE=testfile.big
 testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=800k count=1 
 

+OPT='-o APT::Status-Fd=3 -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1 -o Debug::Acquire::https=1'
+

 msgtest 'download progress works via' 'http'
 msgtest 'download progress works via' 'http'

-printf '\n'

 exec 3> apt-progress.log
 exec 3> apt-progress.log

-testsuccess apthelper download-file "http://localhost:8080/$TESTFILE" http-$TESTFILE -o APT::Status-Fd=3 -o Acquire::http::Dl-Limit=600
+testsuccess --nomsg apthelper download-file "http://localhost:8080/$TESTFILE" http-$TESTFILE $OPT -o Acquire::http::Dl-Limit=800

 assertprogress apt-progress.log
 
 msgtest 'download progress works via' 'https'
 assertprogress apt-progress.log
 
 msgtest 'download progress works via' 'https'

-printf '\n'

 exec 3> apt-progress.log
 exec 3> apt-progress.log

-testsuccess apthelper download-file "https://localhost:4433/$TESTFILE" https-$TESTFILE -o APT::Status-Fd=3 -o Acquire::https::Dl-Limit=600
-assertprogress apt-progress.log
+testsuccess --nomsg apthelper download-file "https://localhost:4433/$TESTFILE" https-$TESTFILE $OPT -o Acquire::https::Dl-Limit=800

 
 # cleanup
 rm -f apt-progress*.log
 
 # cleanup
 rm -f apt-progress*.log