Skip to content

Commit 0539071

Browse files
max630gitster
authored andcommitted
t5562: do not reuse output files
Some expected failures of git-http-backend leaves running its children (receive-pack or upload-pack) which still hold opened descriptors to act.err and with some probability they live long enough to write there their failure messages after next test has already truncated the files. This causes occasional failures of the test script. Avoid the issue by using separated output and error file for each test, apprending the test number to their name. Reported-by: Carlo Arenas <[email protected]> Helped-by: Carlo Arenas <[email protected]> Helped-by: Junio C Hamano <[email protected]> Signed-off-by: Max Kirillov <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent ca1b411 commit 0539071

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

t/t5562-http-backend-content-length.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ test_lazy_prereq GZIP 'gzip --version'
88
verify_http_result() {
99
# some fatal errors still produce status 200
1010
# so check if there is the error message
11-
if grep 'fatal:' act.err
11+
if grep 'fatal:' act.err.$test_count
1212
then
1313
return 1
1414
fi
1515

16-
if ! grep "Status" act.out >act
16+
if ! grep "Status" act.out.$test_count >act
1717
then
1818
printf "Status: 200 OK\r\n" >act
1919
fi
@@ -33,7 +33,7 @@ test_http_env() {
3333
REQUEST_METHOD=POST \
3434
"$PERL_PATH" \
3535
"$TEST_DIRECTORY"/t5562/invoke-with-content-length.pl \
36-
"$request_body" git http-backend >act.out 2>act.err
36+
"$request_body" git http-backend >act.out.$test_count 2>act.err.$test_count
3737
}
3838

3939
ssize_b100dots() {
@@ -161,7 +161,7 @@ test_expect_success 'empty CONTENT_LENGTH' '
161161
GIT_HTTP_EXPORT_ALL=TRUE \
162162
REQUEST_METHOD=GET \
163163
CONTENT_LENGTH="" \
164-
git http-backend <empty_body >act.out 2>act.err &&
164+
git http-backend <empty_body >act.out.$test_count 2>act.err.$test_count &&
165165
verify_http_result "200 OK"
166166
'
167167

0 commit comments

Comments
 (0)