t5504: handle expected output from SIGPIPE death
Commit 8bf4bec (add "ok=sigpipe" to test_must_fail and use it to fix flaky tests, 2015-11-27) taught t5504 to handle "git push" racily exiting with SIGPIPE rather than failing. However, one of the tests checks the output of the command, as well. In the SIGPIPE case, we will not have produced any output. If we want the test to be truly non-flaky, we have to accept either output. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Feb 24, 2016 at 02:48 UTC
43f3afc6bc6b79715ea46aaf341683cbba6ee965
1 file changed
+4
-1
t/t5504-fetch-receive-strict.sh
+4
-1
@@ -101,7 +101,10 @@ test_expect_success 'push with receive.fsckobjects' '
101
git config transfer.fsckobjects false
102
) &&
103
test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act &&
104
- test_cmp exp act
104
+ {
105
+ test_cmp exp act ||
106
+ ! test -s act
107
+ }
108
'
109
110
test_expect_success 'push with transfer.fsckobjects' '