Merge branch 'sg/httpd-test-unflake'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:39 +0000 (15:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Aug 2018 22:30:39 +0000 (15:30 -0700)
httpd tests saw occasional breakage due to the way its access log
gets inspected by the tests, which has been updated to make them
less flaky.

* sg/httpd-test-unflake:
t/lib-httpd: avoid occasional failures when checking access.log
t/lib-httpd: add the strip_access_log() helper function
t5541: clean up truncating access log

1  2 
t/lib-httpd.sh
t/t5541-http-push-smart.sh
t/t5551-http-fetch-smart.sh
t/t5561-http-backend.sh
diff --cc t/lib-httpd.sh
Simple merge
Simple merge
Simple merge
Simple merge