From e1ae0531bfad0fce8590c26d1e38825df22d812a Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Thu, 24 Nov 2016 12:14:39 +0100
Subject: optional write aptwebserver log to client specific files

The test test-handle-redirect-as-used-mirror-change serves multiple
clients at the same time, so the order of the output is undefined and
once in a while the two clients will intermix their lines causing the
grep we perform on it later to fail making our tests fail.

Solved by introducing client-specific logfiles which we all grep and
sort the result to have the results more stable.

Git-Dch: Ignore
---
 test/integration/test-apt-download-progress | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'test/integration/test-apt-download-progress')

diff --git a/test/integration/test-apt-download-progress b/test/integration/test-apt-download-progress
index 7ac044a57..13a18f7c3 100755
--- a/test/integration/test-apt-download-progress
+++ b/test/integration/test-apt-download-progress
@@ -20,14 +20,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=16000k count=1
+testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=1600k 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
+for i in 2 5 7 10 12 15; 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=$((16000/i))
+    testsuccess --nomsg apthelper download-file "http://localhost:${APTHTTPPORT}/$TESTFILE" ./downloaded/http-$TESTFILE $OPT -o Acquire::http::Dl-Limit=$((1600/i))
     if [ "$(wc -l  apt-progress-http.log | awk '{print $1}')" -ge 3 ]; then
         break
     fi
@@ -35,9 +35,9 @@ done
 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
+for i in 2 5 7 10 12 15; 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=$((16000/i))
+    testsuccess --nomsg apthelper download-file "https://localhost:${APTHTTPSPORT}/$TESTFILE" ./downloaded/https-$TESTFILE $OPT -o Acquire::https::Dl-Limit=$((1600/i))
     if [ "$(wc -l  apt-progress-https.log | awk '{print $1}')" -ge 3 ]; then
         break
     fi
-- 
cgit v1.2.3