From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v2 00/15] t5520: various test cleanup
Date: Fri, 18 Oct 2019 15:14:29 -0700 [thread overview]
Message-ID: <20191018221429.GA20245@generichostname> (raw)
In-Reply-To: <cover.1571435195.git.liu.denton@gmail.com>
Sorry for the double-send. public-inbox and MARC both showed that
only 3 messages got through the in the first send so I sent it again.
Seems to have gotten through find the second time around.
On Fri, Oct 18, 2019 at 03:04:03PM -0700, Denton Liu wrote:
> Like earlier patchsets, I want to implement a feature that involves
> modifications to the test suite. Since that feature will probably take a
> while to polish up, however, let's clean up the test suite in a separate
> patchset first so it's not blocked by the feature work.
>
> 1/15 is a cleanup to an unrelated test that I found while addressing
> some of Eric's comments.
>
> 2/15 is a general improvement to test_rev_cmp() that will be used later
> in the series.
>
> Changes since v1:
>
> * Incorporate Eric's feedback
>
> Denton Liu (15):
> t7408: replace `test_must_fail test_path_is_file`
> t: teach test_cmp_rev to accept ! for not-equals
> t5520: improve test style
> t5520: use sq for test case names
> t5520: let sed open its own input
> t5520: replace test -f with test-lib functions
> t5520: remove spaces after redirect operator
> t5520: use test_line_count where possible
> t5520: replace test -{n,z} with test-lib functions
> t5520: use test_cmp_rev where possible
> t5520: test single-line files by git with test_cmp
> t5520: don't put git in upstream of pipe
> t5520: replace subshell cat comparison with test_cmp
> t5520: remove redundant lines in test cases
> t5520: replace `! git` with `test_must_fail git`
>
> t/t2400-worktree-add.sh | 4 +-
> t/t3400-rebase.sh | 2 +-
> t/t3421-rebase-topology-linear.sh | 6 +-
> t/t3430-rebase-merges.sh | 2 +-
> t/t3432-rebase-fast-forward.sh | 2 +-
> t/t3501-revert-cherry-pick.sh | 2 +-
> t/t3508-cherry-pick-many-commits.sh | 2 +-
> t/t5520-pull.sh | 343 +++++++++++++++++-----------
> t/t7408-submodule-reference.sh | 2 +-
> t/test-lib-functions.sh | 13 +-
> 10 files changed, 227 insertions(+), 151 deletions(-)
>
> Range-diff against v1:
> -: ---------- > 1: 987fee4652 t7408: replace `test_must_fail test_path_is_file`
> -: ---------- > 2: 417e808466 t: teach test_cmp_rev to accept ! for not-equals
> 1: 0bc54dd330 = 3: 0a56980857 t5520: improve test style
> 2: a5dee82ecc = 4: dfa89ba1cb t5520: use sq for test case names
> 3: 58cc2fcda3 = 5: 9fac3dff83 t5520: let sed open its own input
> 4: d2946208d3 ! 6: c6ca45eb17 t5520: replace test -f with test_path_is_file
> @@ Metadata
> Author: Denton Liu <liu.denton@gmail.com>
>
> ## Commit message ##
> - t5520: replace test -f with test_path_is_file
> + t5520: replace test -f with test-lib functions
>
> Although `test -f` has the same functionality as test_path_is_file(), in
> the case where test_path_is_file() fails, we get much better debugging
> - information. Replace `test -f` with test_path_is_file so that future
> - developers will have a better experience debugging these test cases.
> + information.
> +
> + Replace `test -f` with test_path_is_file() so that future developers
> + will have a better experience debugging these test cases.
> +
> + Also, in the case of `! test -f`, not only should that path not be a
> + file, it shouldn't exist at all so replace it with
> + test_path_is_missing().
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
>
> @@ t/t5520-pull.sh: test_expect_success 'pulling into void must not create an octop
> cd cloned-octopus &&
> test_must_fail git pull .. master master &&
> - ! test -f file
> -+ test_must_fail test_path_is_file file
> ++ test_path_is_missing file
> )
> '
>
> 5: 5b4c1dd291 = 7: 830a8212ae t5520: remove spaces after redirect operator
> 6: 26fea15950 = 8: 3d982230be t5520: use test_line_count where possible
> 7: 3fc0354c9c ! 9: 2bca4f046d t5520: replace test -{n,z} with test-lib functions
> @@ Metadata
> ## Commit message ##
> t5520: replace test -{n,z} with test-lib functions
>
> + When wrapping a Git command in a subshell within another command, we
> + throw away the Git command's exit code. In case the Git command fails,
> + we would like to know about it rather than the failure being silent.
> + Extract Git commands so that their exit codes are not lost.
> +
> Instead of using `test -n` or `test -z`, replace them respectively with
> - invocations of test_file_not_empty() and test_must_be_empty().
> + invocations of test_file_not_empty() and test_must_be_empty() so that we
> + get better debugging information in the case of a failure.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
>
> 8: f4eb80c9ac ! 10: 1a54db1d5c t5520: use test_cmp_rev where possible
> @@ Commit message
>
> s/test "$(git rev-parse.* \([^)]*\))" = "$(git rev-parse \([^)]*\))"/test_cmp_rev \1 \2/
> s/test \([^ ]*\) = "$(git rev-parse.* \([^)]*\))"/test_cmp_rev \1 \2/
> - s/test "$(git rev-parse.* \([^)]*\))" != "$(git rev-parse.* \([^)]*\))"/test_must_fail test_cmp_rev \1 \2/
> - s/test \([^ ]*\) != "$(git rev-parse.* \([^)]*\))"/test_must_fail test_cmp_rev \1 \2/
> + s/test "$(git rev-parse.* \([^)]*\))" != "$(git rev-parse.* \([^)]*\))"/test_cmp_rev ! \1 \2/
> + s/test \([^ ]*\) != "$(git rev-parse.* \([^)]*\))"/test_cmp_rev ! \1 \2/
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
>
> @@ t/t5520-pull.sh: test_expect_success 'branch.to-rebase.rebase should override pu
> test_config branch.to-rebase.rebase false &&
> git pull . copy &&
> - test "$(git rev-parse HEAD^)" != "$(git rev-parse copy)" &&
> -+ test_must_fail test_cmp_rev HEAD^ copy &&
> ++ test_cmp_rev ! HEAD^ copy &&
> test new = "$(git show HEAD:file2)"
> '
>
> @@ t/t5520-pull.sh: test_expect_success 'pull --rebase dies early with dirty workin
> git checkout HEAD -- file &&
> git pull &&
> - test "$COPY" != "$(git rev-parse --verify me/copy)"
> -+ test_must_fail test_cmp_rev "$COPY" me/copy
> ++ test_cmp_rev ! "$COPY" me/copy
> '
>
> test_expect_success 'pull --rebase works on branch yet to be born' '
> 9: bd3ec4239c ! 11: 52cf4f0d0f t5520: test single-line files by git with test_cmp
> @@ Commit message
> 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.
> +
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
>
> ## t/t5520-pull.sh ##
> @@ t/t5520-pull.sh: test_expect_success 'branch.to-rebase.rebase' '
> @@ t/t5520-pull.sh: test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
> test_config branch.to-rebase.rebase false &&
> git pull . copy &&
> - test_must_fail test_cmp_rev HEAD^ copy &&
> + test_cmp_rev ! HEAD^ copy &&
> - test new = "$(git show HEAD:file2)"
> + echo new >expect &&
> + git show HEAD:file2 >actual &&
> 10: 61b4df0f7c = 12: 0cfabb201c t5520: don't put git in upstream of pipe
> 11: f3429bbb57 ! 13: b2d0ce21c8 t5520: replace subshell cat comparison with test_cmp
> @@ Commit message
> s/\(\s*\)test \([^=]*\)= "$(cat \([^)]*\))"/\1echo \2>expect \&\&\n\1test_cmp expect \3/
> s/\(\s*\)test "$(cat \([^)]*\))" = \([^&]*\)\( &&\)\?$/\1echo \3 >expect \&\&\n\1test_cmp expect \2\4/
>
> + 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.
> +
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
>
> ## t/t5520-pull.sh ##
> -: ---------- > 14: 5aac40a029 t5520: remove redundant lines in test cases
> 12: 3e6c591b2b = 15: 2c0d3ac416 t5520: replace `! git` with `test_must_fail git`
> --
> 2.23.0.897.g0a19638b1e
>
next prev parent reply other threads:[~2019-10-18 22:14 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 ` Denton Liu [this message]
2019-10-22 10:19 ` [PATCH v3 00/14] t5520: various test cleanup 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
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191018221429.GA20245@generichostname \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).