Skip to content

Commit 7fb089f

Browse files
committed
Merge branch 'jk/t5551-expensive-test-timeouts-fix'
The Apache timeout in HTTP tests has been increased to prevent test failures on heavily loaded CI runners. The tests creating an enormous number of refs have been isolated to their own repositories to avoid slowing down subsequent tests. * jk/t5551-expensive-test-timeouts-fix: t5551: put many-tags case into its own repo t/lib-httpd: bump apache timeout
2 parents 1274757 + f6ef747 commit 7fb089f

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

t/lib-httpd/apache.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ DocumentRoot www
44
LogFormat "%h %l %u %t \"%r\" %>s %b" common
55
CustomLog access.log common
66
ErrorLog error.log
7+
Timeout 600
78
<IfModule !mod_log_config.c>
89
LoadModule log_config_module modules/mod_log_config.so
910
</IfModule>

t/t5551-http-fetch-smart.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,15 +397,16 @@ create_tags () {
397397
}
398398

399399
test_expect_success 'create 2,000 tags in the repo' '
400+
git init --bare "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
400401
(
401-
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
402+
cd "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
402403
create_tags 1 2000
403404
)
404405
'
405406

406407
test_expect_success CMDLINE_LIMIT \
407408
'clone the 2,000 tag repo to check OS command line overflow' '
408-
run_with_limited_cmdline git clone $HTTPD_URL/smart/repo.git too-many-refs &&
409+
run_with_limited_cmdline git clone $HTTPD_URL/smart/many-tags.git too-many-refs &&
409410
(
410411
cd too-many-refs &&
411412
git for-each-ref refs/tags >actual &&
@@ -483,12 +484,12 @@ test_expect_success 'test allowanysha1inwant with unreachable' '
483484
test_expect_success EXPENSIVE 'http can handle enormous ref negotiation' '
484485
test_when_finished "rm -f tags" &&
485486
(
486-
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
487+
cd "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
487488
create_tags 2001 50000
488489
) &&
489490
git -C too-many-refs fetch -q --tags &&
490491
(
491-
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
492+
cd "$HTTPD_DOCUMENT_ROOT_PATH/many-tags.git" &&
492493
create_tags 50001 100000
493494
) &&
494495
git -C too-many-refs fetch -q --tags &&

0 commit comments

Comments
 (0)