implement socks5h proxy support for http method

[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 9966c7258968dc258d473d1efcf5c52bee901642..7ac044a57a497a8a6d684a79288364404985c71e 100755 (executable)
--- a/test/integration/test-apt-download-progress
+++ b/test/integration/test-apt-download-progress
@@ -11,27 +11,23 @@ setupenvironment
 changetohttpswebserver
 
 assertprogress() {
 changetohttpswebserver
 
 assertprogress() {

-    T="$1"
-    testsuccess grep "dlstatus:1:0:Retrieving file 1 of 1" "$T"
-    if ! grep -E -q "dlstatus:1:(0\..*|([1-9](\..*)?)|[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"
+    testsuccess grep "dlstatus:1:0.0000:Retrieving file 1 of 1" "$1"
+    testsuccess grep -E "dlstatus:1:[1-9][0-9]{0,1}\.[0-9]{1,4}:Retrieving file 1 of 1" "$1"
+    testsuccess grep "dlstatus:1:100.0000:Retrieving file 1 of 1" "$1"

 }
 
 # we need to ensure the file is reasonable big so that apt has a chance to
 # actually report progress - but not too big to ensure its not delaying the
 # test too much
 TESTFILE=testfile.big
 }
 
 # we need to ensure the file is reasonable big so that apt has a chance to
 # actually report progress - but not too big to ensure its not delaying the
 # test too much
 TESTFILE=testfile.big

-testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=800k count=1
+testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=16000k 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'
 for i in 1 2 3 4 5 6 7 8 9 10; do
     exec 3> apt-progress-http.log
 
 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'
 for i in 1 2 3 4 5 6 7 8 9 10; do
     exec 3> apt-progress-http.log

-    testsuccess --nomsg apthelper download-file "http://localhost:${APTHTTPPORT}/$TESTFILE" ./downloaded/http-$TESTFILE $OPT -o Acquire::http::Dl-Limit=$((1600/i))
+    testsuccess --nomsg apthelper download-file "http://localhost:${APTHTTPPORT}/$TESTFILE" ./downloaded/http-$TESTFILE $OPT -o Acquire::http::Dl-Limit=$((16000/i))

     if [ "$(wc -l  apt-progress-http.log | awk '{print $1}')" -ge 3 ]; then
         break
     fi
     if [ "$(wc -l  apt-progress-http.log | awk '{print $1}')" -ge 3 ]; then
         break
     fi


@@ -41,7 +37,7 @@ assertprogress apt-progress-http.log
 msgtest 'download progress works via' 'https'
 for i in 1 2 3 4 5 6 7 8 9 10; do
     exec 3> apt-progress-https.log
 msgtest 'download progress works via' 'https'
 for i in 1 2 3 4 5 6 7 8 9 10; do
     exec 3> apt-progress-https.log

-    testsuccess --nomsg apthelper download-file "https://localhost:${APTHTTPSPORT}/$TESTFILE" ./downloaded/https-$TESTFILE $OPT -o Acquire::https::Dl-Limit=$((1600/i))
+    testsuccess --nomsg apthelper download-file "https://localhost:${APTHTTPSPORT}/$TESTFILE" ./downloaded/https-$TESTFILE $OPT -o Acquire::https::Dl-Limit=$((16000/i))

     if [ "$(wc -l  apt-progress-https.log | awk '{print $1}')" -ge 3 ]; then
         break
     fi
     if [ "$(wc -l  apt-progress-https.log | awk '{print $1}')" -ge 3 ]; then
         break
     fi