diff options
author | SZEDER Gábor <szeder.dev@gmail.com> | 2018-07-12 15:22:15 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-12 20:40:31 +0300 |
commit | 6940a0602267a4b9ce328bc0f29784253b3df58d (patch) | |
tree | 976dd53764986805c8ebd150cacf8cd2063006df /t/t5541-http-push-smart.sh | |
parent | a704c6439a9a34045f6d5bde78d5982b11e6d478 (diff) |
t/lib-httpd: add the strip_access_log() helper function
Four tests in three httpd-related test scripts check the contents of
Apache's 'access.log', and they all do so by running 'sed' with the
exact same script consisting of four s/// commands to strip
uninteresting log fields and to vertically align the requested URLs.
Extract this into a common helper function 'strip_access_log' in
'lib-httpd.sh', and use it in all of those tests.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5541-http-push-smart.sh')
-rwxr-xr-x | t/t5541-http-push-smart.sh | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh index dc08275b7d..3fbe7722ff 100755 --- a/t/t5541-http-push-smart.sh +++ b/t/t5541-http-push-smart.sh @@ -47,12 +47,7 @@ test_expect_success 'no empty path components' ' cd "$ROOT_PATH" && git clone $HTTPD_URL/smart/test_repo.git/ test_repo_clone && - sed -e " - s/^.* \"// - s/\"// - s/ [1-9][0-9]*\$// - s/^GET /GET / - " >act <"$HTTPD_ROOT_PATH"/access.log && + strip_access_log >act && test_cmp exp act ' @@ -134,12 +129,7 @@ GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200 POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200 EOF test_expect_success 'used receive-pack service' ' - sed -e " - s/^.* \"// - s/\"// - s/ [1-9][0-9]*\$// - s/^GET /GET / - " >act <"$HTTPD_ROOT_PATH"/access.log && + strip_access_log >act && test_cmp exp act ' |