From: Johannes Sixt <j6t@kdbg.org>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Vincent Lefevre <vincent@vinc17.net>,
Chris Torek <chris.torek@gmail.com>,
Denton Liu <liu.denton@gmail.com>,
Jeff Hostetler <jeffhost@microsoft.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2 2/5] pager: test for exit code with and without SIGPIPE
Date: Fri, 5 Feb 2021 08:47:52 +0100 [thread overview]
Message-ID: <9c686629-82d9-f441-a255-a288fe322881@kdbg.org> (raw)
In-Reply-To: <20210202020001.31601-3-avarab@gmail.com>
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.
>
> 1. https://lore.kernel.org/git/87o8h4omqa.fsf@evledraar.gmail.com/
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> 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
>
next prev parent reply other threads:[~2021-02-05 7:48 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-15 16:15 git fails with a broken pipe when one quits the pager Vincent Lefevre
2021-01-29 23:48 ` [PATCH] pager: exit without error on SIGPIPE Denton Liu
2021-01-30 8:29 ` Johannes Sixt
2021-01-30 12:52 ` Johannes Sixt
2021-02-01 15:03 ` Ævar Arnfjörð Bjarmason
2021-02-01 17:47 ` Junio C Hamano
2021-02-01 19:52 ` Ævar Arnfjörð Bjarmason
2021-02-01 20:55 ` Junio C Hamano
2021-02-02 2:05 ` Ævar Arnfjörð Bjarmason
2021-02-02 4:45 ` Junio C Hamano
2021-02-02 5:25 ` Junio C Hamano
2021-02-02 7:45 ` Johannes Sixt
2021-02-02 20:13 ` Junio C Hamano
2021-02-02 22:15 ` Johannes Sixt
2021-02-02 22:21 ` Junio C Hamano
2021-02-03 17:07 ` Johannes Sixt
2021-02-03 18:12 ` Junio C Hamano
2021-02-04 15:10 ` Vincent Lefevre
2021-02-03 2:45 ` Ævar Arnfjörð Bjarmason
2021-02-03 2:54 ` Junio C Hamano
2021-02-03 3:36 ` Ævar Arnfjörð Bjarmason
2021-02-03 17:19 ` Johannes Sixt
2021-01-31 1:47 ` git fails with a broken pipe when one quits the pager Ævar Arnfjörð Bjarmason
2021-01-31 3:36 ` Vincent Lefevre
2021-01-31 3:47 ` Vincent Lefevre
2021-01-31 20:49 ` Ævar Arnfjörð Bjarmason
2021-02-01 10:34 ` Vincent Lefevre
2021-02-01 11:33 ` Chris Torek
2021-02-01 12:36 ` Vincent Lefevre
2021-02-01 12:53 ` Chris Torek
2021-02-01 15:17 ` Vincent Lefevre
2021-02-01 15:00 ` Ævar Arnfjörð Bjarmason
2021-02-01 12:10 ` Ævar Arnfjörð Bjarmason
2021-02-01 14:48 ` Vincent Lefevre
2021-02-01 15:44 ` Ævar Arnfjörð Bjarmason
2021-02-01 22:16 ` Johannes Sixt
2021-02-03 2:48 ` Ævar Arnfjörð Bjarmason
2021-02-03 17:11 ` Johannes Sixt
2021-02-03 15:26 ` Vincent Lefevre
2021-02-04 0:14 ` Ævar Arnfjörð Bjarmason
2021-02-04 15:38 ` Vincent Lefevre
2021-02-01 14:49 ` [PATCH 0/3] pager: test for exit behavior & trace2 bug fix Ævar Arnfjörð Bjarmason
2021-02-02 1:59 ` [PATCH v2 0/5] " Ævar Arnfjörð Bjarmason
2021-02-02 1:59 ` [PATCH v2 1/5] pager: refactor wait_for_pager() function Ævar Arnfjörð Bjarmason
2021-02-02 1:59 ` [PATCH v2 2/5] pager: test for exit code with and without SIGPIPE Ævar Arnfjörð Bjarmason
2021-02-02 8:50 ` Denton Liu
2021-02-05 7:47 ` Johannes Sixt [this message]
2021-02-02 1:59 ` [PATCH v2 3/5] run-command: add braces for "if" block in wait_or_whine() Ævar Arnfjörð Bjarmason
2021-02-02 2:00 ` [PATCH v2 4/5] pager: properly log pager exit code when signalled Ævar Arnfjörð Bjarmason
2021-02-05 7:58 ` Johannes Sixt
2021-02-05 11:37 ` Junio C Hamano
2021-02-02 2:00 ` [WIP/PATCH v2 5/5] WIP pager: respect exit code of pager over SIGPIPE Ævar Arnfjörð Bjarmason
2021-02-01 14:49 ` [PATCH 1/3] pager: test for exit code Ævar Arnfjörð Bjarmason
2021-02-01 14:49 ` [PATCH 2/3] pager: refactor wait_for_pager() function Ævar Arnfjörð Bjarmason
2021-02-01 14:49 ` [PATCH 3/3] pager: properly log pager exit code when signalled Ævar Arnfjörð Bjarmason
2021-02-01 18:07 ` Junio C Hamano
2021-02-01 19:21 ` Ævar Arnfjörð Bjarmason
2021-02-01 18:15 ` Junio C Hamano
2021-02-01 19:23 ` Ævar Arnfjörð Bjarmason
2021-02-01 22:04 ` git fails with a broken pipe when one quits the pager Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9c686629-82d9-f441-a255-a288fe322881@kdbg.org \
--to=j6t@kdbg.org \
--cc=avarab@gmail.com \
--cc=chris.torek@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=liu.denton@gmail.com \
--cc=vincent@vinc17.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).