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

6 files changed, 25 insertions, 15 deletions

diff --git a/test/integration/framework b/test/integration/framework
index 9a114ae69..05c8fcd2a 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1305,7 +1305,7 @@ changetowebserver() {
 	if test -x "${APTTESTHELPERSBINDIR}/aptwebserver"; then
 		cd aptarchive
 		local LOG="webserver.log"
-		if ! aptwebserver --port 0 -o aptwebserver::fork=1 -o aptwebserver::portfile='aptwebserver.port' "$@" >$LOG 2>&1 ; then
+		if ! aptwebserver --port 0 -o aptwebserver::fork=1 -o aptwebserver::portfile='aptwebserver.port' -o aptwebserver::logfiles="$(readlink -f .)/$LOG" "$@" >$LOG 2>&1 ; then
 			cat "$LOG"
 			false
 		fi
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
diff --git a/test/integration/test-apt-update-filesize-mismatch b/test/integration/test-apt-update-filesize-mismatch
index 9f95906b5..9467e77b6 100755
--- a/test/integration/test-apt-update-filesize-mismatch
+++ b/test/integration/test-apt-update-filesize-mismatch
@@ -24,7 +24,7 @@ testsuccess aptget update
 testsuccess aptcache show foo
 testsuccess aptget install foo -s
 
-for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.log); do
+for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.log.client*.log); do
 	for ext in '' '.gz'; do
 		COMPRESSFILE="$get"
 		get="${get}${ext}"
diff --git a/test/integration/test-apt-update-hashsum-mismatch b/test/integration/test-apt-update-hashsum-mismatch
index f3f6a4236..4d4c33286 100755
--- a/test/integration/test-apt-update-hashsum-mismatch
+++ b/test/integration/test-apt-update-hashsum-mismatch
@@ -27,7 +27,7 @@ testsuccess aptget update
 testsuccess aptcache show foo
 testsuccess aptget install foo -s
 
-for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.log); do
+for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver.log.client*.log); do
 	msgmsg 'Test hashsum mismatch with file' "$get"
 	rm -rf rootdir/var/lib/apt/lists
 	webserverconfig 'aptwebserver::overwrite' ''
diff --git a/test/integration/test-bug-602412-dequote-redirect b/test/integration/test-bug-602412-dequote-redirect
index b4da876cb..9c6aa3945 100755
--- a/test/integration/test-bug-602412-dequote-redirect
+++ b/test/integration/test-bug-602412-dequote-redirect
@@ -32,8 +32,9 @@ Reading package lists..." aptget update
 
 for CODE in 301 302 307; do
 	webserverconfig 'aptwebserver::redirect::httpcode' "$CODE"
+	rm -f aptarchive/webserver.log.client*.log
 	testrun "$CODE" "http://localhost:${APTHTTPPORT}"
-	testsuccess grep "^HTTP/1.1 $CODE " aptarchive/webserver.log
+	testsuccess grep "^HTTP/1.1 $CODE " aptarchive/webserver.log.client*.log
 	rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives
 done
 
@@ -41,7 +42,9 @@ changetohttpswebserver
 
 for CODE in 301 302 307; do
 	webserverconfig 'aptwebserver::redirect::httpcode' "$CODE"
+	rm -f aptarchive/webserver.log.client*.log
 	testrun "$CODE" "https://localhost:${APTHTTPSPORT}"
+	testsuccess grep "^HTTP/1.1 $CODE " aptarchive/webserver.log.client*.log
 	rm -rf rootdir/var/lib/apt/lists rootdir/var/cache/apt/archives
 done
 
diff --git a/test/integration/test-handle-redirect-as-used-mirror-change b/test/integration/test-handle-redirect-as-used-mirror-change
index 2655f713c..254bdd54a 100755
--- a/test/integration/test-handle-redirect-as-used-mirror-change
+++ b/test/integration/test-handle-redirect-as-used-mirror-change
@@ -21,23 +21,30 @@ Get:3 http://0.0.0.0:${APTHTTPPORT} unstable/main all Packages [$(stat -c %s apt
 Get:4 http://0.0.0.0:${APTHTTPPORT} unstable/main Translation-en [$(stat -c %s aptarchive/dists/unstable/main/i18n/Translation-en.gz) B]
 Reading package lists..." aptget update
 
+grepwebserverlogs() {
+	testsuccess grep -h "$1" aptarchive/webserver.log.client*.log
+	shift
+	sort rootdir/tmp/testsuccess.output > aptwebserver.log
+	testfileequal 'aptwebserver.log' "$@"
+}
+
 # ensure we asked the redirector only once
-testsuccessequal "Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/InRelease" grep '^Location:' aptarchive/webserver.log
+grepwebserverlogs '^Location:' "Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/InRelease"
 
 testsuccessequal "Hit:1 http://0.0.0.0:${APTHTTPPORT} unstable InRelease
 Reading package lists..." aptget update
 
-testsuccessequal "Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/InRelease
-Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/InRelease" grep '^Location:' aptarchive/webserver.log
+grepwebserverlogs '^Location:' "Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/InRelease
+Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/InRelease"
 
 rm -rf rootdir/var/lib/apt/lists
 testsuccess apt update -o Debug::Acquire::http=1 -o Acquire::SameMirrorForAllIndexes=0
-testsuccessequal "Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/InRelease
+grepwebserverlogs '^Location:' "Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/InRelease
 Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/InRelease
 Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/InRelease
-Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/main/source/Sources.gz
 Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/main/binary-all/Packages.gz
-Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/main/i18n/Translation-en.gz" grep '^Location:' aptarchive/webserver.log
+Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/main/i18n/Translation-en.gz
+Location: http://0.0.0.0:${APTHTTPPORT}/dists/unstable/main/source/Sources.gz"
 
 cd downloaded
 testsuccess apthelper download-file "http://localhost:${APTHTTPPORT}/redirectme/dists/unstable/InRelease" inrelease