summaryrefslogtreecommitdiff
path: root/t/t5561-http-backend.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-15 22:43:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-15 22:43:36 (GMT)
commitc92df72bf425226380587be00dee08346a0ba9d4 (patch)
tree93edf79dceddb2a56cc0c9c10ceab0987a0101a8 /t/t5561-http-backend.sh
parent30ce3b3bbced1fb17a40247a83017332f4e102fd (diff)
parent362d8b6e0d313e0e06553f5c390dc7f2172c0569 (diff)
downloadgit-c92df72bf425226380587be00dee08346a0ba9d4.zip
git-c92df72bf425226380587be00dee08346a0ba9d4.tar.gz
git-c92df72bf425226380587be00dee08346a0ba9d4.tar.bz2
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-xt/t5561-http-backend.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/t/t5561-http-backend.sh b/t/t5561-http-backend.sh
index 19afe96..90e0d6f 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
###