undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/http-flaky-test-fix' into maint

Browse Source 
A test script for the HTTP service had a timing dependent bug,
which was fixed.

* sb/http-flaky-test-fix:
  t5561: get rid of racy appending to logfile
This commit is contained in:
Junio C Hamano 2015-10-16 14:32:49 -07:00
commit 8f6f1771da
3 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t5560-http-backend-noserver.sh
View File

@ -44,10 +44,6 @@ POST() {
test_cmp exp act test_cmp exp act
} }
log_div() {
return 0
}
. "$TEST_DIRECTORY"/t556x_common . "$TEST_DIRECTORY"/t556x_common
expect_aliased() { expect_aliased() {

8
t/t5561-http-backend.sh
View File

@ -29,15 +29,9 @@ POST() {
test_cmp exp act 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 . "$TEST_DIRECTORY"/t556x_common
cat >exp <<EOF grep '^[^#]' >exp <<EOF
### refs/heads/master ### refs/heads/master
### ###

12
t/t556x_common
View File

@ -52,21 +52,17 @@ get_static_files() {
SMART=smart SMART=smart
GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL
test_expect_success 'direct refs/heads/master not found' ' test_expect_success 'direct refs/heads/master not found' '
log_div "refs/heads/master" &&
GET refs/heads/master "404 Not Found" GET refs/heads/master "404 Not Found"
' '
test_expect_success 'static file is ok' ' test_expect_success 'static file is ok' '
log_div "getanyfile default" &&
get_static_files "200 OK" get_static_files "200 OK"
' '
SMART=smart_noexport SMART=smart_noexport
unset GIT_HTTP_EXPORT_ALL unset GIT_HTTP_EXPORT_ALL
test_expect_success 'no export by default' ' test_expect_success 'no export by default' '
log_div "no git-daemon-export-ok" &&
get_static_files "404 Not Found" get_static_files "404 Not Found"
' '
test_expect_success 'export if git-daemon-export-ok' ' test_expect_success 'export if git-daemon-export-ok' '
log_div "git-daemon-export-ok" &&
(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && (cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
touch git-daemon-export-ok touch git-daemon-export-ok
) && ) &&
@ -75,47 +71,39 @@ test_expect_success 'export if git-daemon-export-ok' '
SMART=smart SMART=smart
GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL
test_expect_success 'static file if http.getanyfile true is ok' ' test_expect_success 'static file if http.getanyfile true is ok' '
log_div "getanyfile true" &&
config http.getanyfile true && config http.getanyfile true &&
get_static_files "200 OK" get_static_files "200 OK"
' '
test_expect_success 'static file if http.getanyfile false fails' ' test_expect_success 'static file if http.getanyfile false fails' '
log_div "getanyfile false" &&
config http.getanyfile false && config http.getanyfile false &&
get_static_files "403 Forbidden" get_static_files "403 Forbidden"
' '
test_expect_success 'http.uploadpack default enabled' ' test_expect_success 'http.uploadpack default enabled' '
log_div "uploadpack default" &&
GET info/refs?service=git-upload-pack "200 OK" && GET info/refs?service=git-upload-pack "200 OK" &&
POST git-upload-pack 0000 "200 OK" POST git-upload-pack 0000 "200 OK"
' '
test_expect_success 'http.uploadpack true' ' test_expect_success 'http.uploadpack true' '
log_div "uploadpack true" &&
config http.uploadpack true && config http.uploadpack true &&
GET info/refs?service=git-upload-pack "200 OK" && GET info/refs?service=git-upload-pack "200 OK" &&
POST git-upload-pack 0000 "200 OK" POST git-upload-pack 0000 "200 OK"
' '
test_expect_success 'http.uploadpack false' ' test_expect_success 'http.uploadpack false' '
log_div "uploadpack false" &&
config http.uploadpack false && config http.uploadpack false &&
GET info/refs?service=git-upload-pack "403 Forbidden" && GET info/refs?service=git-upload-pack "403 Forbidden" &&
POST git-upload-pack 0000 "403 Forbidden" POST git-upload-pack 0000 "403 Forbidden"
' '
test_expect_success 'http.receivepack default disabled' ' test_expect_success 'http.receivepack default disabled' '
log_div "receivepack default" &&
GET info/refs?service=git-receive-pack "403 Forbidden" && GET info/refs?service=git-receive-pack "403 Forbidden" &&
POST git-receive-pack 0000 "403 Forbidden" POST git-receive-pack 0000 "403 Forbidden"
' '
test_expect_success 'http.receivepack true' ' test_expect_success 'http.receivepack true' '
log_div "receivepack true" &&
config http.receivepack true && config http.receivepack true &&
GET info/refs?service=git-receive-pack "200 OK" && GET info/refs?service=git-receive-pack "200 OK" &&
POST git-receive-pack 0000 "200 OK" POST git-receive-pack 0000 "200 OK"
' '
test_expect_success 'http.receivepack false' ' test_expect_success 'http.receivepack false' '
log_div "receivepack false" &&
config http.receivepack false && config http.receivepack false &&
GET info/refs?service=git-receive-pack "403 Forbidden" && GET info/refs?service=git-receive-pack "403 Forbidden" &&
POST git-receive-pack 0000 "403 Forbidden" POST git-receive-pack 0000 "403 Forbidden"