diff options
| author | Stephan Beyer <s-beyer@gmx.net> | 2015-09-24 20:12:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-25 08:45:25 -0700 |
| commit | 362d8b6e0d313e0e06553f5c390dc7f2172c0569 (patch) | |
| tree | d28a5b26ee2d886edbd2eb84182ffcacbf3065c3 /t/t5561-http-backend.sh | |
| parent | e156455ea49124c140a67623f22a393db62d5d98 (diff) | |
| download | git-362d8b6e0d313e0e06553f5c390dc7f2172c0569.tar.gz | |
t5561: get rid of racy appending to logfilesb/http-flaky-test-fix
The definition of log_div() appended information to the web server's
logfile to make the test more readable. However, log_div() was called
right after a request is served (which is done by git-http-backend);
the web server waits for the git-http-backend process to exit before
it writes to the log file. When the duration between serving a request
and exiting was long, the log_div() output was written before the last
request's log, and the test failed. (This duration could become
especially long for PROFILE=GEN builds.)
To get rid of this behavior, we should not change the logfile at all.
This commit removes log_div() and its calls. The additional information
is kept in the test (for readability reasons) but filtered out before
comparing it to the actual logfile.
Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5561-http-backend.sh')
| -rwxr-xr-x | t/t5561-http-backend.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/t/t5561-http-backend.sh b/t/t5561-http-backend.sh index d23fb02384..13f91d7d5a 100755 --- a/t/t5561-http-backend.sh +++ b/t/t5561-http-backend.sh @@ -35,15 +35,9 @@ POST() { test_cmp exp act } -log_div() { - echo >>"$HTTPD_ROOT_PATH"/access.log - echo "### $1" >>"$HTTPD_ROOT_PATH"/access.log - echo "###" >>"$HTTPD_ROOT_PATH"/access.log -} - . "$TEST_DIRECTORY"/t556x_common -cat >exp <<EOF +grep '^[^#]' >exp <<EOF ### refs/heads/master ### |