mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
362d8b6e0d
The definition of log_div() appended information to the web server's logfile to make the test more readable. However, log_div() was called right after a request is served (which is done by git-http-backend); the web server waits for the git-http-backend process to exit before it writes to the log file. When the duration between serving a request and exiting was long, the log_div() output was written before the last request's log, and the test failed. (This duration could become especially long for PROFILE=GEN builds.) To get rid of this behavior, we should not change the logfile at all. This commit removes log_div() and its calls. The additional information is kept in the test (for readability reasons) but filtered out before comparing it to the actual logfile. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
71 lines
1.5 KiB
Bash
Executable file
71 lines
1.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='test git-http-backend-noserver'
|
|
. ./test-lib.sh
|
|
|
|
HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
|
|
|
|
test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U
|
|
|
|
run_backend() {
|
|
echo "$2" |
|
|
QUERY_STRING="${1#*[?]}" \
|
|
PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/${1%%[?]*}" \
|
|
git http-backend >act.out 2>act.err
|
|
}
|
|
|
|
GET() {
|
|
REQUEST_METHOD="GET" && export REQUEST_METHOD &&
|
|
run_backend "/repo.git/$1" &&
|
|
sane_unset REQUEST_METHOD &&
|
|
if ! grep "Status" act.out >act
|
|
then
|
|
printf "Status: 200 OK\r\n" >act
|
|
fi
|
|
printf "Status: $2\r\n" >exp &&
|
|
test_cmp exp act
|
|
}
|
|
|
|
POST() {
|
|
REQUEST_METHOD="POST" && export REQUEST_METHOD &&
|
|
CONTENT_TYPE="application/x-$1-request" && export CONTENT_TYPE &&
|
|
run_backend "/repo.git/$1" "$2" &&
|
|
sane_unset REQUEST_METHOD &&
|
|
sane_unset CONTENT_TYPE &&
|
|
if ! grep "Status" act.out >act
|
|
then
|
|
printf "Status: 200 OK\r\n" >act
|
|
fi
|
|
printf "Status: $3\r\n" >exp &&
|
|
test_cmp exp act
|
|
}
|
|
|
|
. "$TEST_DIRECTORY"/t556x_common
|
|
|
|
expect_aliased() {
|
|
REQUEST_METHOD="GET" && export REQUEST_METHOD &&
|
|
if test $1 = 0; then
|
|
run_backend "$2"
|
|
else
|
|
run_backend "$2" &&
|
|
echo "fatal: '$2': aliased" >exp.err &&
|
|
test_cmp exp.err act.err
|
|
fi
|
|
unset REQUEST_METHOD
|
|
}
|
|
|
|
test_expect_success 'http-backend blocks bad PATH_INFO' '
|
|
config http.getanyfile true &&
|
|
|
|
expect_aliased 0 /repo.git/HEAD &&
|
|
|
|
expect_aliased 1 /repo.git/../HEAD &&
|
|
expect_aliased 1 /../etc/passwd &&
|
|
expect_aliased 1 ../etc/passwd &&
|
|
expect_aliased 1 /etc//passwd &&
|
|
expect_aliased 1 /etc/./passwd &&
|
|
expect_aliased 1 //domain/data.txt
|
|
'
|
|
|
|
test_done
|