diff options
| author |  Jeff King <peff@peff.net> | 2016-04-19 18:51:25 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-20 13:33:59 -0700 |
| commit | c4b27511ab0e3ec464e3fd3d4711251a17b1f733 (patch) | |
| tree | 0fb94bf4aea1351f23577f95e8b11bf3412adb5b | |
| parent | fetch-pack: isolate sigpipe in demuxer thread (diff) | |
| download | tgif-c4b27511ab0e3ec464e3fd3d4711251a17b1f733.tar.xz | |
t5504: drop sigpipe=ok from push tests
These were added by 8bf4bec (add "ok=sigpipe" to
test_must_fail and use it to fix flaky tests, 2015-11-27)
because we would racily die via SIGPIPE when the pack was
rejected by the other side.
But since we have recently de-flaked send-pack, we should be
able to tighten up these tests (including re-adding the
expected output checks).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5504-fetch-receive-strict.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh index a3e12d295a..44f3d5fb28 100755 --- a/t/t5504-fetch-receive-strict.sh +++ b/t/t5504-fetch-receive-strict.sh @@ -100,11 +100,8 @@ test_expect_success 'push with receive.fsckobjects' ' git config receive.fsckobjects true && git config transfer.fsckobjects false ) && - test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act && - { - test_cmp exp act || - ! test -s act - } + test_must_fail git push --porcelain dst master:refs/heads/test >act && + test_cmp exp act ' test_expect_success 'push with transfer.fsckobjects' ' @@ -114,7 +111,8 @@ test_expect_success 'push with transfer.fsckobjects' ' cd dst && git config transfer.fsckobjects true ) && - test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act + test_must_fail git push --porcelain dst master:refs/heads/test >act && + test_cmp exp act ' cat >bogus-commit <<\EOF |