@matheusbsbs / matheus-bagliano / commits / 8bf4becf0c

add "ok=sigpipe" to test_must_fail and use it to fix flaky tests

t5516 "75 - deny fetch unreachable SHA1, allowtipsha1inwant=true" is flaky in the following case: 1. remote upload-pack finds out "not our ref" 2. remote sends a response and closes the pipe 3. fetch-pack still tries to write commands to the remote upload-pack 4. write call in wrapper.c dies with SIGPIPE The test is flaky because the sending fetch-pack may or may not have finished writing its output by step (3). If it did, then we see a closed pipe on the next read() call. If it didn't, then we get the SIGPIPE from step (4) above. Both are fine, but the latter fools test_must_fail. t5504 "9 - push with transfer.fsckobjects" is flaky, too, and returns SIGPIPE once in a while. I had to remove the final "To dst..." output check because there is no output if the process dies with SIGPIPE. Accept such a death-with-sigpipe also as OK when we are expecting a failure. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Jeff King <peff@peff.net>

Lars Schneider committed Nov 27, 2015 at 10:15 UTC 8bf4becf0c1e4b4ca56dab3501f9cd3da3362215

3 files changed +8 -6

t/t5504-fetch-receive-strict.sh

+2 -3

@@ -100,7 +100,7 @@ test_expect_success 'push with receive.fsckobjects' '

100 git config receive.fsckobjects true &&

101 git config transfer.fsckobjects false

102 ) &&

103 - test_must_fail git push --porcelain dst master:refs/heads/test >act &&

103 + test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act &&

104 test_cmp exp act

105 '

106

@@ -111,8 +111,7 @@ test_expect_success 'push with transfer.fsckobjects' '

111 cd dst &&

112 git config transfer.fsckobjects true

113 ) &&

114 - test_must_fail git push --porcelain dst master:refs/heads/test >act &&

115 - test_cmp exp act

114 + test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act

115 '

116

117 cat >bogus-commit <<\EOF

t/t5516-fetch-push.sh

+3 -3

@@ -1162,15 +1162,15 @@ do

1162 mk_empty shallow &&

1163 (

1164 cd shallow &&

1165 - test_must_fail git fetch ../testrepo/.git $SHA1_3 &&

1166 - test_must_fail git fetch ../testrepo/.git $SHA1_1 &&

1165 + test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3 &&

1166 + test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_1 &&

1167 git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&

1168 git fetch ../testrepo/.git $SHA1_1 &&

1169 git cat-file commit $SHA1_1 &&

1170 test_must_fail git cat-file commit $SHA1_2 &&

1171 git fetch ../testrepo/.git $SHA1_2 &&

1172 git cat-file commit $SHA1_2 &&

1173 - test_must_fail git fetch ../testrepo/.git $SHA1_3

1173 + test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3

1174 )

1175 '

1176 done

t/test-lib-functions.sh

@@ -612,6 +612,9 @@ test_must_fail () {

612 then

613 echo >&2 "test_must_fail: command succeeded: $*"

614 return 1

615 + elif test $exit_code -eq 141 && list_contains "$_test_ok" sigpipe

616 + then

617 + return 0

618 elif test $exit_code -gt 129 && test $exit_code -le 192

619 then

620 echo >&2 "test_must_fail: died by signal: $*"