From: Denton Liu <liu.denton@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Johannes Sixt" <j6t@kdbg.org>,
"SZEDER Gábor" <szeder.dev@gmail.com>
Subject: Re: [PATCH v5 10/14] t5520: test single-line files by git with test_cmp
Date: Tue, 12 Nov 2019 15:06:37 -0800 [thread overview]
Message-ID: <20191112230637.GA61654@generichostname> (raw)
In-Reply-To: <xmqqh839fzbm.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Tue, Nov 12, 2019 at 02:17:33PM +0900, Junio C Hamano wrote:
> Denton Liu <liu.denton@gmail.com> writes:
>
> > In case an invocation of a Git command fails within the subshell, the
> > failure will be masked. Replace the subshell with a file-redirection and
> > a call to test_cmp.
>
> I.e.
>
> test "$(git cmd args)" = "expected-string"
>
> =>
>
> git cmd args >actual && echo "expected-string" >expect &&
> test_cmp expect actual
>
> which makes sense. It may break if expected-string begins with a
> dash or something silly like that, but a quick eyeballing over the
> patch tells me that we are safe there.
>
> Technically, "$(git cmd args)" used as a command line option of
> another command is called "command substitution", not "subshell".
> The proposed log message may need to be updated.
Okay, I'll send out a new reroll with some log message cleanup.
>
> > This change was done with the following GNU sed expressions:
> >
> > s/\(\s*\)test \([^ ]*\) = "$(\(git [^)]*\))"/\1echo \2 >expect \&\&\n\1\3 >actual \&\&\n\1test_cmp expect actual/
> > s/\(\s*\)test "$(\(git [^)]*\))" = \([^ ]*\)/\1echo \3 >expect \&\&\n\1\2 >actual \&\&\n\1test_cmp expect actual/
> >
> > A future patch will clean up situations where we have multiple duplicate
> > statements within a test case. This is done to keep this patch purely
> > mechanical.
>
> OK. One thing that worries me is if the existing tests are not
> expecting (no pun intended) to see 'expect' or 'actual' (e.g. if
> they somehow rely on output of "ls-files -u", we are now adding two
> untracked files in the working tree).
Do you mean `ls-files -o`? I think `-u` means "unmerged" while `-o`
means "others" (or "untracked"). This test doesn't have any instances of
`-o` being used.
> Another is if the git command
> is expected to produce nothing, possibly after failing, and the test
> is expecting to see an empty string---in such a case, the hiding of
> the exit status would have been intentional ;-) We'd want to be sure
> that we aren't breaking the tests like that by reading through the
> result of applying this patch.
>
> Since this is just a single file, I trust you have already done such
> sanity checking ;-)
Thanks for double-checking on me. I have, indeed, manually verified the
changes.
>
> The mechanical conversion procedure itself looks OK.
>
> Thanks.
next prev parent reply other threads:[~2019-11-12 23:06 UTC|newest]
Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 23:16 [PATCH 00/12] t5520: various test cleanup Denton Liu
2019-10-17 23:16 ` [PATCH 01/12] t5520: improve test style Denton Liu
2019-10-17 23:16 ` [PATCH 02/12] t5520: use sq for test case names Denton Liu
2019-10-17 23:17 ` [PATCH 03/12] t5520: let sed open its own input Denton Liu
2019-10-17 23:17 ` [PATCH 04/12] t5520: replace test -f with test_path_is_file Denton Liu
2019-10-17 23:26 ` Eric Sunshine
2019-10-17 23:35 ` [PATCH 4.5/12] t5520: replace test -f with test-lib functions Denton Liu
2019-10-18 0:11 ` Eric Sunshine
2019-10-17 23:17 ` [PATCH 05/12] t5520: remove spaces after redirect operator Denton Liu
2019-10-17 23:17 ` [PATCH 06/12] t5520: use test_line_count where possible Denton Liu
2019-10-17 23:17 ` [PATCH 07/12] t5520: replace test -{n,z} with test-lib functions Denton Liu
2019-10-17 23:31 ` Eric Sunshine
2019-10-17 23:17 ` [PATCH 08/12] t5520: use test_cmp_rev where possible Denton Liu
2019-10-17 23:41 ` Eric Sunshine
2019-10-18 18:52 ` Denton Liu
2019-10-23 13:53 ` Eric Sunshine
2019-10-17 23:17 ` [PATCH 09/12] t5520: test single-line files by git with test_cmp Denton Liu
2019-10-17 23:49 ` Eric Sunshine
2019-10-17 23:17 ` [PATCH 10/12] t5520: don't put git in upstream of pipe Denton Liu
2019-10-17 23:17 ` [PATCH 11/12] t5520: replace subshell cat comparison with test_cmp Denton Liu
2019-10-17 23:17 ` [PATCH 12/12] t5520: replace `! git` with `test_must_fail git` Denton Liu
2019-10-18 22:10 ` [PATCH v2 00/15] t5520: various test cleanup Denton Liu
2019-10-18 22:04 ` [PATCH v2 01/15] t7408: replace `test_must_fail test_path_is_file` Denton Liu
2019-10-19 11:58 ` Johannes Sixt
2019-10-18 22:04 ` [PATCH v2 09/15] t5520: replace test -{n,z} with test-lib functions Denton Liu
2019-10-18 22:04 ` [PATCH v2 11/15] t5520: test single-line files by git with test_cmp Denton Liu
2019-10-18 22:10 ` [PATCH v2 02/15] t: teach test_cmp_rev to accept ! for not-equals Denton Liu
2019-10-18 22:45 ` SZEDER Gábor
2019-10-18 22:10 ` [PATCH v2 03/15] t5520: improve test style Denton Liu
2019-10-18 22:10 ` [PATCH v2 04/15] t5520: use sq for test case names Denton Liu
2019-10-18 22:10 ` [PATCH v2 05/15] t5520: let sed open its own input Denton Liu
2019-10-18 22:10 ` [PATCH v2 06/15] t5520: replace test -f with test-lib functions Denton Liu
2019-10-18 22:10 ` [PATCH v2 07/15] t5520: remove spaces after redirect operator Denton Liu
2019-10-18 22:10 ` [PATCH v2 08/15] t5520: use test_line_count where possible Denton Liu
2019-10-18 22:10 ` [PATCH v2 10/15] t5520: use test_cmp_rev " Denton Liu
2019-10-18 22:10 ` [PATCH v2 12/15] t5520: don't put git in upstream of pipe Denton Liu
2019-10-18 22:10 ` [PATCH v2 13/15] t5520: replace subshell cat comparison with test_cmp Denton Liu
2019-10-18 22:10 ` [PATCH v2 14/15] t5520: remove redundant lines in test cases Denton Liu
2019-10-18 22:10 ` [PATCH v2 15/15] t5520: replace `! git` with `test_must_fail git` Denton Liu
2019-10-18 22:14 ` [PATCH v2 00/15] t5520: various test cleanup Denton Liu
2019-10-22 10:19 ` [PATCH v3 00/14] " Denton Liu
2019-10-22 10:19 ` [PATCH v3 01/14] t: teach test_cmp_rev to accept ! for not-equals Denton Liu
2019-10-22 10:19 ` [PATCH v3 02/14] t5520: improve test style Denton Liu
2019-10-22 10:19 ` [PATCH v3 03/14] t5520: use sq for test case names Denton Liu
2019-10-22 10:20 ` [PATCH v3 04/14] t5520: let sed open its own input Denton Liu
2019-10-22 10:20 ` [PATCH v3 05/14] t5520: replace test -f with test-lib functions Denton Liu
2019-10-22 10:20 ` [PATCH v3 06/14] t5520: remove spaces after redirect operator Denton Liu
2019-10-22 10:20 ` [PATCH v3 07/14] t5520: use test_line_count where possible Denton Liu
2019-10-22 10:20 ` [PATCH v3 08/14] t5520: replace test -{n,z} with test-lib functions Denton Liu
2019-10-22 10:20 ` [PATCH v3 09/14] t5520: use test_cmp_rev where possible Denton Liu
2019-10-22 10:20 ` [PATCH v3 10/14] t5520: test single-line files by git with test_cmp Denton Liu
2019-10-22 10:20 ` [PATCH v3 11/14] t5520: don't put git in upstream of pipe Denton Liu
2019-10-22 10:20 ` [PATCH v3 12/14] t5520: replace subshell cat comparison with test_cmp Denton Liu
2019-10-22 10:20 ` [PATCH v3 13/14] t5520: remove redundant lines in test cases Denton Liu
2019-10-22 10:20 ` [PATCH v3 14/14] t5520: replace `! git` with `test_must_fail git` Denton Liu
2019-10-24 23:21 ` [PATCH v3 00/14] t5520: various test cleanup Denton Liu
2019-10-25 3:44 ` Junio C Hamano
2019-11-04 19:17 ` Denton Liu
2019-11-06 2:37 ` Junio C Hamano
2019-11-07 18:51 ` [PATCH v4 " Denton Liu
2019-11-07 18:51 ` [PATCH v4 01/14] t: teach test_cmp_rev to accept ! for not-equals Denton Liu
2019-11-08 3:24 ` Junio C Hamano
2019-11-08 8:23 ` Denton Liu
2019-11-08 12:49 ` Junio C Hamano
2019-11-08 21:19 ` Denton Liu
2019-11-10 6:58 ` Junio C Hamano
2019-11-07 18:51 ` [PATCH v4 02/14] t5520: improve test style Denton Liu
2019-11-07 18:51 ` [PATCH v4 03/14] t5520: use sq for test case names Denton Liu
2019-11-07 18:51 ` [PATCH v4 04/14] t5520: let sed open its own input Denton Liu
2019-11-07 18:51 ` [PATCH v4 05/14] t5520: replace test -f with test-lib functions Denton Liu
2019-11-07 18:51 ` [PATCH v4 06/14] t5520: remove spaces after redirect operator Denton Liu
2019-11-07 18:51 ` [PATCH v4 07/14] t5520: use test_line_count where possible Denton Liu
2019-11-07 18:51 ` [PATCH v4 08/14] t5520: replace test -{n,z} with test-lib functions Denton Liu
2019-11-07 18:51 ` [PATCH v4 09/14] t5520: use test_cmp_rev where possible Denton Liu
2019-11-07 18:51 ` [PATCH v4 10/14] t5520: test single-line files by git with test_cmp Denton Liu
2019-11-07 18:51 ` [PATCH v4 11/14] t5520: don't put git in upstream of pipe Denton Liu
2019-11-07 18:51 ` [PATCH v4 12/14] t5520: replace subshell cat comparison with test_cmp Denton Liu
2019-11-07 18:51 ` [PATCH v4 13/14] t5520: remove redundant lines in test cases Denton Liu
2019-11-07 18:51 ` [PATCH v4 14/14] t5520: replace `! git` with `test_must_fail git` Denton Liu
2019-11-12 0:13 ` [PATCH v5 00/14] t5520: various test cleanup Denton Liu
2019-11-12 0:13 ` [PATCH v5 01/14] t: teach test_cmp_rev to accept ! for not-equals Denton Liu
2019-11-12 6:52 ` Junio C Hamano
2019-11-12 19:38 ` [PATCH] fixup! " Denton Liu
2019-11-12 0:13 ` [PATCH v5 02/14] t5520: improve test style Denton Liu
2019-11-12 0:13 ` [PATCH v5 03/14] t5520: use sq for test case names Denton Liu
2019-11-12 0:13 ` [PATCH v5 04/14] t5520: let sed open its own input Denton Liu
2019-11-12 0:13 ` [PATCH v5 05/14] t5520: replace test -f with test-lib functions Denton Liu
2019-11-12 0:13 ` [PATCH v5 06/14] t5520: remove spaces after redirect operator Denton Liu
2019-11-12 0:13 ` [PATCH v5 07/14] t5520: use test_line_count where possible Denton Liu
2019-11-12 0:13 ` [PATCH v5 08/14] t5520: replace test -{n,z} with test-lib functions Denton Liu
2019-11-12 0:14 ` [PATCH v5 09/14] t5520: use test_cmp_rev where possible Denton Liu
2019-11-12 0:14 ` [PATCH v5 10/14] t5520: test single-line files by git with test_cmp Denton Liu
2019-11-12 5:17 ` Junio C Hamano
2019-11-12 23:06 ` Denton Liu [this message]
2019-11-12 0:14 ` [PATCH v5 11/14] t5520: don't put git in upstream of pipe Denton Liu
2019-11-12 0:14 ` [PATCH v5 12/14] t5520: replace subshell cat comparison with test_cmp Denton Liu
2019-11-12 0:14 ` [PATCH v5 13/14] t5520: remove redundant lines in test cases Denton Liu
2019-11-12 0:14 ` [PATCH v5 14/14] t5520: replace `! git` with `test_must_fail git` Denton Liu
2019-11-12 23:07 ` [PATCH v6 00/14] t5520: various test cleanup Denton Liu
2019-11-12 23:07 ` [PATCH v6 01/14] t: teach test_cmp_rev to accept ! for not-equals Denton Liu
2019-11-13 1:57 ` Junio C Hamano
2019-11-14 0:52 ` Denton Liu
2019-11-12 23:07 ` [PATCH v6 02/14] t5520: improve test style Denton Liu
2019-11-12 23:07 ` [PATCH v6 03/14] t5520: use sq for test case names Denton Liu
2019-11-12 23:07 ` [PATCH v6 04/14] t5520: let sed open its own input Denton Liu
2019-11-12 23:07 ` [PATCH v6 05/14] t5520: replace test -f with test-lib functions Denton Liu
2019-11-12 23:07 ` [PATCH v6 06/14] t5520: remove spaces after redirect operator Denton Liu
2019-11-12 23:08 ` [PATCH v6 07/14] t5520: use test_line_count where possible Denton Liu
2019-11-12 23:08 ` [PATCH v6 08/14] t5520: replace test -{n,z} with test-lib functions Denton Liu
2019-11-12 23:08 ` [PATCH v6 09/14] t5520: use test_cmp_rev where possible Denton Liu
2019-11-12 23:08 ` [PATCH v6 10/14] t5520: test single-line files by git with test_cmp Denton Liu
2019-11-12 23:08 ` [PATCH v6 11/14] t5520: don't put git in upstream of pipe Denton Liu
2019-11-12 23:08 ` [PATCH v6 12/14] t5520: replace $(cat ...) comparison with test_cmp Denton Liu
2019-11-12 23:08 ` [PATCH v6 13/14] t5520: remove redundant lines in test cases Denton Liu
2019-11-12 23:08 ` [PATCH v6 14/14] t5520: replace `! git` with `test_must_fail git` Denton Liu
2019-11-13 1:59 ` [PATCH v6 00/14] t5520: various test cleanup Junio C Hamano
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=20191112230637.GA61654@generichostname \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.