Re: [PATCH v2 2/5] pager: test for exit code with and without SIGPIPE
From: Johannes Sixt <hidden>
Date: 2021-02-05 07:48:40
Am 02.02.21 um 02:59 schrieb Ævar Arnfjörð Bjarmason:
Add tests for how git behaves when the pager itself exits with non-zero, as well as for us exiting with 141 when we're killed with SIGPIPE due to the pager not consuming its output. There is some recent discussion[1] about these semantics, but aside from what we want to do in the future, we should have a test for the current behavior. This test construct is stolen from 7559a1be8a0 (unblock and unignore SIGPIPE, 2014-09-18). The reason not to make the test itself depend on the MINGW prerequisite is to make a subsequent commit easier to read.
At least for my Windows build, the MINGW games do not make a difference: The test is skipped anyway due to the unsatisfied TTY prerequisite.
quoted hunk ↗ jump to hunk
1. https://lore.kernel.org/git/87o8h4omqa.fsf@evledraar.gmail.com/ (local) Signed-off-by: Ævar Arnfjörð Bjarmason <redacted> --- t/t7006-pager.sh | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+)diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index fdb450e446a..0aa030962b1 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh@@ -656,4 +656,86 @@ test_expect_success TTY 'git tag with auto-columns ' ' test_cmp expect actual ' +test_expect_success TTY 'git returns SIGPIPE on early pager exit' ' + test_when_finished "rm pager-used" && + test_config core.pager ">pager-used; head -n 1; exit 0" && + + if test_have_prereq !MINGW + then + OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) && + test_match_signal 13 "$OUT" + else + test_terminal git log + fi && + test_path_is_file pager-used +' + +test_expect_success TTY 'git returns SIGPIPE on early pager non-zero exit' ' + test_when_finished "rm pager-used" && + test_config core.pager ">pager-used; head -n 1; exit 1" && + + if test_have_prereq !MINGW + then + OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) && + test_match_signal 13 "$OUT" + else + test_terminal git log + fi && + test_path_is_file pager-used +' + +test_expect_success TTY 'git discards pager non-zero exit without SIGPIPE' ' + test_when_finished "rm pager-used" && + test_config core.pager "wc >pager-used; exit 1" && + + if test_have_prereq !MINGW + then + OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) && + test "$OUT" -eq 0 + else + test_terminal git log + fi && + test_path_is_file pager-used +' + +test_expect_success TTY 'git discards nonexisting pager without SIGPIPE' ' + test_when_finished "rm pager-used" && + test_config core.pager "wc >pager-used; does-not-exist" && + + if test_have_prereq !MINGW + then + OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) && + test "$OUT" -eq 0 + else + test_terminal git log + fi && + test_path_is_file pager-used +' + +test_expect_success TTY 'git attempts to page to nonexisting pager command, gets SIGPIPE' ' + test_config core.pager "does-not-exist" && + + if test_have_prereq !MINGW + then + OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) && + test_match_signal 13 "$OUT" + else + test_terminal git log + fi +' + +test_expect_success TTY 'git returns SIGPIPE on propagated signals from pager' ' + test_when_finished "rm pager-used" && + test_config core.pager ">pager-used; test-tool sigchain" && + + if test_have_prereq !MINGW + then + OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) && + test_match_signal 13 "$OUT" + else + test_terminal git log + fi && + test_path_is_file pager-used +' + test_done