|
|
@@ -24,14 +24,14 @@ assertprogress() {
|
|
|
# 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
|
|
|
- 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
|
|
|
@@ -41,7 +41,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
|
|
|
- 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
|