mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
t5561: get rid of racy appending to logfile
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>
This commit is contained in:
parent
e156455ea4
commit
362d8b6e0d
|
@ -40,10 +40,6 @@ POST() {
|
|||
test_cmp exp act
|
||||
}
|
||||
|
||||
log_div() {
|
||||
return 0
|
||||
}
|
||||
|
||||
. "$TEST_DIRECTORY"/t556x_common
|
||||
|
||||
expect_aliased() {
|
||||
|
|
|
@ -35,15 +35,9 @@ POST() {
|
|||
test_cmp exp act
|
||||
}
|
||||
|
||||
log_div() {
|
||||
echo >>"$HTTPD_ROOT_PATH"/access.log
|
||||
echo "### $1" >>"$HTTPD_ROOT_PATH"/access.log
|
||||
echo "###" >>"$HTTPD_ROOT_PATH"/access.log
|
||||
}
|
||||
|
||||
. "$TEST_DIRECTORY"/t556x_common
|
||||
|
||||
cat >exp <<EOF
|
||||
grep '^[^#]' >exp <<EOF
|
||||
|
||||
### refs/heads/master
|
||||
###
|
||||
|
|
|
@ -52,21 +52,17 @@ get_static_files() {
|
|||
SMART=smart
|
||||
GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL
|
||||
test_expect_success 'direct refs/heads/master not found' '
|
||||
log_div "refs/heads/master" &&
|
||||
GET refs/heads/master "404 Not Found"
|
||||
'
|
||||
test_expect_success 'static file is ok' '
|
||||
log_div "getanyfile default" &&
|
||||
get_static_files "200 OK"
|
||||
'
|
||||
SMART=smart_noexport
|
||||
unset GIT_HTTP_EXPORT_ALL
|
||||
test_expect_success 'no export by default' '
|
||||
log_div "no git-daemon-export-ok" &&
|
||||
get_static_files "404 Not Found"
|
||||
'
|
||||
test_expect_success 'export if git-daemon-export-ok' '
|
||||
log_div "git-daemon-export-ok" &&
|
||||
(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
||||
touch git-daemon-export-ok
|
||||
) &&
|
||||
|
@ -75,47 +71,39 @@ test_expect_success 'export if git-daemon-export-ok' '
|
|||
SMART=smart
|
||||
GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL
|
||||
test_expect_success 'static file if http.getanyfile true is ok' '
|
||||
log_div "getanyfile true" &&
|
||||
config http.getanyfile true &&
|
||||
get_static_files "200 OK"
|
||||
'
|
||||
test_expect_success 'static file if http.getanyfile false fails' '
|
||||
log_div "getanyfile false" &&
|
||||
config http.getanyfile false &&
|
||||
get_static_files "403 Forbidden"
|
||||
'
|
||||
|
||||
test_expect_success 'http.uploadpack default enabled' '
|
||||
log_div "uploadpack default" &&
|
||||
GET info/refs?service=git-upload-pack "200 OK" &&
|
||||
POST git-upload-pack 0000 "200 OK"
|
||||
'
|
||||
test_expect_success 'http.uploadpack true' '
|
||||
log_div "uploadpack true" &&
|
||||
config http.uploadpack true &&
|
||||
GET info/refs?service=git-upload-pack "200 OK" &&
|
||||
POST git-upload-pack 0000 "200 OK"
|
||||
'
|
||||
test_expect_success 'http.uploadpack false' '
|
||||
log_div "uploadpack false" &&
|
||||
config http.uploadpack false &&
|
||||
GET info/refs?service=git-upload-pack "403 Forbidden" &&
|
||||
POST git-upload-pack 0000 "403 Forbidden"
|
||||
'
|
||||
|
||||
test_expect_success 'http.receivepack default disabled' '
|
||||
log_div "receivepack default" &&
|
||||
GET info/refs?service=git-receive-pack "403 Forbidden" &&
|
||||
POST git-receive-pack 0000 "403 Forbidden"
|
||||
'
|
||||
test_expect_success 'http.receivepack true' '
|
||||
log_div "receivepack true" &&
|
||||
config http.receivepack true &&
|
||||
GET info/refs?service=git-receive-pack "200 OK" &&
|
||||
POST git-receive-pack 0000 "200 OK"
|
||||
'
|
||||
test_expect_success 'http.receivepack false' '
|
||||
log_div "receivepack false" &&
|
||||
config http.receivepack false &&
|
||||
GET info/refs?service=git-receive-pack "403 Forbidden" &&
|
||||
POST git-receive-pack 0000 "403 Forbidden"
|
||||
|
|
Loading…
Reference in a new issue