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>
This commit is contained in:

committed by
Junio C Hamano

parent
a704c6439a
commit
6940a06022
@ -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
|
||||
'
|
||||
|
||||
|
Reference in New Issue
Block a user