diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2016-11-24 12:14:39 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2016-11-25 00:15:13 +0100 |
| commit | e1ae0531bfad0fce8590c26d1e38825df22d812a (patch) | |
| tree | 54b648fe14a8d64778f2fc01050543a31f6c45f8 /test/integration/test-bug-602412-dequote-redirect | |
| parent | 0123ce7171b09ead5a07567fbd33c53f609f6560 (diff) | |
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
Diffstat (limited to 'test/integration/test-bug-602412-dequote-redirect')
| -rwxr-xr-x | test/integration/test-bug-602412-dequote-redirect | 5 |
1 files changed, 4 insertions, 1 deletions
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 |