mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01: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>
110 lines
2.9 KiB
Bash
Executable file
110 lines
2.9 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
find_file() {
|
|
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
find $1 -type f |
|
|
sed -e 1q
|
|
}
|
|
|
|
config() {
|
|
git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" config $1 $2
|
|
}
|
|
|
|
test_expect_success 'setup repository' '
|
|
echo content >file &&
|
|
git add file &&
|
|
git commit -m one &&
|
|
|
|
mkdir "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
git --bare init &&
|
|
: >objects/info/alternates &&
|
|
: >objects/info/http-alternates
|
|
) &&
|
|
git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
git push public master:master &&
|
|
|
|
(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
git repack -a -d
|
|
) &&
|
|
|
|
echo other >file &&
|
|
git add file &&
|
|
git commit -m two &&
|
|
git push public master:master &&
|
|
|
|
LOOSE_URL=$(find_file objects/??) &&
|
|
PACK_URL=$(find_file objects/pack/*.pack) &&
|
|
IDX_URL=$(find_file objects/pack/*.idx)
|
|
'
|
|
|
|
get_static_files() {
|
|
GET HEAD "$1" &&
|
|
GET info/refs "$1" &&
|
|
GET objects/info/packs "$1" &&
|
|
GET objects/info/alternates "$1" &&
|
|
GET objects/info/http-alternates "$1" &&
|
|
GET $LOOSE_URL "$1" &&
|
|
GET $PACK_URL "$1" &&
|
|
GET $IDX_URL "$1"
|
|
}
|
|
|
|
SMART=smart
|
|
GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL
|
|
test_expect_success 'direct refs/heads/master not found' '
|
|
GET refs/heads/master "404 Not Found"
|
|
'
|
|
test_expect_success 'static file is ok' '
|
|
get_static_files "200 OK"
|
|
'
|
|
SMART=smart_noexport
|
|
unset GIT_HTTP_EXPORT_ALL
|
|
test_expect_success 'no export by default' '
|
|
get_static_files "404 Not Found"
|
|
'
|
|
test_expect_success 'export if git-daemon-export-ok' '
|
|
(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
|
|
touch git-daemon-export-ok
|
|
) &&
|
|
get_static_files "200 OK"
|
|
'
|
|
SMART=smart
|
|
GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL
|
|
test_expect_success 'static file if http.getanyfile true is ok' '
|
|
config http.getanyfile true &&
|
|
get_static_files "200 OK"
|
|
'
|
|
test_expect_success 'static file if http.getanyfile false fails' '
|
|
config http.getanyfile false &&
|
|
get_static_files "403 Forbidden"
|
|
'
|
|
|
|
test_expect_success 'http.uploadpack default enabled' '
|
|
GET info/refs?service=git-upload-pack "200 OK" &&
|
|
POST git-upload-pack 0000 "200 OK"
|
|
'
|
|
test_expect_success 'http.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' '
|
|
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' '
|
|
GET info/refs?service=git-receive-pack "403 Forbidden" &&
|
|
POST git-receive-pack 0000 "403 Forbidden"
|
|
'
|
|
test_expect_success 'http.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' '
|
|
config http.receivepack false &&
|
|
GET info/refs?service=git-receive-pack "403 Forbidden" &&
|
|
POST git-receive-pack 0000 "403 Forbidden"
|
|
'
|