diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:49 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-10-16 14:32:49 -0700 |
commit | 8f6f1771da430442f81027714519eaeadcbaa01e (patch) | |
tree | 5d77f3579348c6c4311eafe4783d3bd87613bd90 /t/t5561-http-backend.sh | |
parent | Merge branch 'sb/perf-without-installed-git' into maint (diff) | |
parent | t5561: get rid of racy appending to logfile (diff) | |
download | tgif-8f6f1771da430442f81027714519eaeadcbaa01e.tar.xz |
Merge branch 'sb/http-flaky-test-fix' into maint
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 ### |