diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-03 01:30:39 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-03 01:30:39 +0300 |
| commit | bc6d33e87ac930286fe0bfc882b837bba4b18501 (patch) | |
| tree | 6aefd65164f3655090dd213322be1f2692dd59e9 /t/t5561-http-backend.sh | |
| parent | 5e98080188f2ef8034947b5c341371e1dfb6c2aa (diff) | |
| parent | e8b3b2e275106c4fae1fb2b5969924a4565615e6 (diff) | |
Merge branch 'sg/httpd-test-unflake'
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
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 84a955770a..1c49054595 100755 --- a/t/t5561-http-backend.sh +++ b/t/t5561-http-backend.sh @@ -129,13 +129,7 @@ GET /smart/repo.git/info/refs?service=git-receive-pack HTTP/1.1 403 - POST /smart/repo.git/git-receive-pack HTTP/1.1 403 - EOF test_expect_success 'server request log matches test results' ' - sed -e " - s/^.* \"// - s/\"// - s/ [1-9][0-9]*\$// - s/^GET /GET / - " >act <"$HTTPD_ROOT_PATH"/access.log && - test_cmp exp act + check_access_log exp ' stop_httpd |