Skip to content

Commit c4b2751

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent df85757 commit c4b2751

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

t/t5504-fetch-receive-strict.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,8 @@ test_expect_success 'push with receive.fsckobjects' '
100100
git config receive.fsckobjects true &&
101101
git config transfer.fsckobjects false
102102
) &&
103-
test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act &&
104-
{
105-
test_cmp exp act ||
106-
! test -s act
107-
}
103+
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
104+
test_cmp exp act
108105
'
109106

110107
test_expect_success 'push with transfer.fsckobjects' '
@@ -114,7 +111,8 @@ test_expect_success 'push with transfer.fsckobjects' '
114111
cd dst &&
115112
git config transfer.fsckobjects true
116113
) &&
117-
test_must_fail ok=sigpipe git push --porcelain dst master:refs/heads/test >act
114+
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
115+
test_cmp exp act
118116
'
119117

120118
cat >bogus-commit <<\EOF

0 commit comments

Comments
 (0)