Browse Source

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>
maint
Jeff King 9 years ago committed by Junio C Hamano
parent
commit
c4b27511ab
  1. 10
      t/t5504-fetch-receive-strict.sh

10
t/t5504-fetch-receive-strict.sh

@ -100,11 +100,8 @@ test_expect_success 'push with receive.fsckobjects' ' @@ -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' ' @@ -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

Loading…
Cancel
Save