Skip to content

Commit 98024d1

Browse files
peffgitster
authored andcommitted
t5516: drop ok=sigpipe from unreachable-want tests
We annotated our test_must_fail calls in 8bf4bec (add "ok=sigpipe" to test_must_fail and use it to fix flaky tests, 2015-11-27) because the abrupt hangup of the server meant that we'd sometimes fail on read() and sometimes get SIGPIPE on write(). But since 1435889 (fetch: ignore SIGPIPE during network operation, 2019-03-03), we make sure that we end up with a real die(), and our tests no longer need to work around the race. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e35b8cb commit 98024d1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

t/t5516-fetch-push.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,15 +1232,15 @@ do
12321232
mk_empty shallow &&
12331233
(
12341234
cd shallow &&
1235-
test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3 &&
1236-
test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_1 &&
1235+
test_must_fail git fetch ../testrepo/.git $SHA1_3 &&
1236+
test_must_fail git fetch ../testrepo/.git $SHA1_1 &&
12371237
git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
12381238
git fetch ../testrepo/.git $SHA1_1 &&
12391239
git cat-file commit $SHA1_1 &&
12401240
test_must_fail git cat-file commit $SHA1_2 &&
12411241
git fetch ../testrepo/.git $SHA1_2 &&
12421242
git cat-file commit $SHA1_2 &&
1243-
test_must_fail ok=sigpipe git fetch ../testrepo/.git $SHA1_3
1243+
test_must_fail git fetch ../testrepo/.git $SHA1_3
12441244
)
12451245
'
12461246
done

0 commit comments

Comments
 (0)