From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 16 Oct 2015 21:32:49 +0000 (-0700)
Subject: Merge branch 'sb/http-flaky-test-fix' into maint
X-Git-Tag: v2.6.2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8f6f1771da430442f81027714519eaeadcbaa01e?ds=inline;hp=-c

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
---

8f6f1771da430442f81027714519eaeadcbaa01e
diff --combined t/t5560-http-backend-noserver.sh
index aa73eeaef8,9d54ef478c..9fafcf1945
--- a/t/t5560-http-backend-noserver.sh
+++ b/t/t5560-http-backend-noserver.sh
@@@ -5,11 -5,7 +5,11 @@@ test_description='test git-http-backend
  
  HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
  
 -test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U
 +if test_have_prereq GREP_STRIPS_CR
 +then
 +	GREP_OPTIONS=-U
 +	export GREP_OPTIONS
 +fi
  
  run_backend() {
  	echo "$2" |
@@@ -44,10 -40,6 +44,6 @@@ POST() 
  	test_cmp exp act
  }
  
- log_div() {
- 	return 0
- }
- 
  . "$TEST_DIRECTORY"/t556x_common
  
  expect_aliased() {
diff --combined t/t5561-http-backend.sh
index 19afe96698,13f91d7d5a..90e0d6f0fe
--- a/t/t5561-http-backend.sh
+++ b/t/t5561-http-backend.sh
@@@ -2,6 -2,12 +2,6 @@@
  
  test_description='test git-http-backend'
  . ./test-lib.sh
 -
 -if test -n "$NO_CURL"; then
 -	skip_all='skipping test, git built without http support'
 -	test_done
 -fi
 -
  . "$TEST_DIRECTORY"/lib-httpd.sh
  start_httpd
  
@@@ -29,15 -35,9 +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
  ###