Skip to content

Commit 9b3fadf

Browse files
peffgitster
authored andcommitted
t7700: annotate cruft-pack failure with ok=sigpipe
One of our tests intentionally causes the cruft-pack generation phase of repack to fail, in order to stimulate an exit from repack at the desired moment. It does so by feeding a bogus option argument to pack-objects. This is a simple and reliable way to get pack-objects to fail, but it has one downside: pack-objects will die before reading its stdin, which means the caller repack may racily get SIGPIPE writing to it. For the purposes of this test, that's OK. We are checking whether repack cleans up already-created .tmp files, and it will do so whether it exits or dies by signal (because the tempfile API hooks both). But we have to tell test_must_fail that either outcome is OK, or it complains about the signal. Arguably this is a workaround (compared to fixing repack), as repack dying to SIGPIPE means that it loses the opportunity to give a more detailed message. But we don't actually write such a message anyway; we rely on pack-objects to have written something useful to stderr, and it does. In either case (signal or exit), that is the main thing the user will see. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1934307 commit 9b3fadf

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t7700-repack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ test_expect_success TTY '--quiet disables progress' '
433433
'
434434

435435
test_expect_success 'clean up .tmp-* packs on error' '
436-
test_must_fail git \
436+
test_must_fail ok=sigpipe git \
437437
-c repack.cruftwindow=bogus \
438438
repack -ad --cruft &&
439439
find $objdir/pack -name '.tmp-*' >tmpfiles &&

0 commit comments

Comments
 (0)