diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-15 15:43:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-15 15:43:36 -0700 |
| commit | c92df72bf425226380587be00dee08346a0ba9d4 (patch) | |
| tree | 93edf79dceddb2a56cc0c9c10ceab0987a0101a8 /t/t5561-http-backend.sh | |
| parent | Merge branch 'jc/fsck-dropped-errors' (diff) | |
| parent | t5561: get rid of racy appending to logfile (diff) | |
| download | tgif-c92df72bf425226380587be00dee08346a0ba9d4.tar.xz | |
Merge branch 'sb/http-flaky-test-fix'
A test script for the HTTP service had a timing dependent bug,
which was fixed.
* sb/http-flaky-test-fix:
t5561: get rid of racy appending to logfile
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 19afe96698..90e0d6f0fe 100755 --- a/t/t5561-http-backend.sh +++ b/t/t5561-http-backend.sh @@ -29,15 +29,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 ### |