From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: git@vger.kernel.org
Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH 4/4] t6402: use test_line_count_cmd to count # of lines in stdout
Date: Sat, 12 Jun 2021 11:27:55 +0700 [thread overview]
Message-ID: <20210612042755.28342-5-congdanhqx@gmail.com> (raw)
In-Reply-To: <20210612042755.28342-1-congdanhqx@gmail.com>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
t/t6402-merge-rename.sh | 126 +++++++++++++++++++---------------------
1 file changed, 59 insertions(+), 67 deletions(-)
diff --git a/t/t6402-merge-rename.sh b/t/t6402-merge-rename.sh
index 5d76cd6414..81502dba84 100755
--- a/t/t6402-merge-rename.sh
+++ b/t/t6402-merge-rename.sh
@@ -105,10 +105,8 @@ test_expect_success 'pull renaming branch into unrenaming one' \
git show-branch &&
test_expect_code 1 git pull . white &&
git ls-files -s &&
- git ls-files -u B >b.stages &&
- test_line_count = 3 b.stages &&
- git ls-files -s N >n.stages &&
- test_line_count = 1 n.stages &&
+ test_line_count_cmd --out = 3 git ls-files -u B &&
+ test_line_count_cmd --out = 1 git ls-files -s N &&
sed -ne "/^g/{
p
q
@@ -122,10 +120,8 @@ test_expect_success 'pull renaming branch into another renaming one' \
git reset --hard &&
git checkout red &&
test_expect_code 1 git pull . white &&
- git ls-files -u B >b.stages &&
- test_line_count = 3 b.stages &&
- git ls-files -s N >n.stages &&
- test_line_count = 1 n.stages &&
+ test_line_count_cmd --out = 3 git ls-files -u B &&
+ test_line_count_cmd --out = 1 git ls-files -s N &&
sed -ne "/^g/{
p
q
@@ -138,10 +134,8 @@ test_expect_success 'pull unrenaming branch into renaming one' \
git reset --hard &&
git show-branch &&
test_expect_code 1 git pull . main &&
- git ls-files -u B >b.stages &&
- test_line_count = 3 b.stages &&
- git ls-files -s N >n.stages &&
- test_line_count = 1 n.stages &&
+ test_line_count_cmd --out = 3 git ls-files -u B &&
+ test_line_count_cmd --out = 1 git ls-files -s N &&
sed -ne "/^g/{
p
q
@@ -154,14 +148,10 @@ test_expect_success 'pull conflicting renames' \
git reset --hard &&
git show-branch &&
test_expect_code 1 git pull . blue &&
- git ls-files -u A >a.stages &&
- test_line_count = 1 a.stages &&
- git ls-files -u B >b.stages &&
- test_line_count = 1 b.stages &&
- git ls-files -u C >c.stages &&
- test_line_count = 1 c.stages &&
- git ls-files -s N >n.stages &&
- test_line_count = 1 n.stages &&
+ test_line_count_cmd --out = 1 git ls-files -u A &&
+ test_line_count_cmd --out = 1 git ls-files -u B &&
+ test_line_count_cmd --out = 1 git ls-files -u C &&
+ test_line_count_cmd --out = 1 git ls-files -s N &&
sed -ne "/^g/{
p
q
@@ -330,8 +320,8 @@ test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' '
test_i18ngrep "Adding as dir~HEAD instead" output
fi &&
- test 3 -eq "$(git ls-files -u | wc -l)" &&
- test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+ test_line_count_cmd --out = 3 git ls-files -u &&
+ test_line_count_cmd --out = 2 git ls-files -u dir/file-in-the-way &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -357,8 +347,8 @@ test_expect_success 'Same as previous, but merged other way' '
test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output
fi &&
- test 3 -eq "$(git ls-files -u | wc -l)" &&
- test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+ test_line_count_cmd --out = 3 git ls-files -u &&
+ test_line_count_cmd --out = 2 git ls-files -u dir/file-in-the-way &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -374,8 +364,8 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in
git checkout -q renamed-file-has-conflicts^0 &&
test_must_fail git merge --strategy=recursive dir-not-in-way &&
- test 3 -eq "$(git ls-files -u | wc -l)" &&
- test 3 -eq "$(git ls-files -u dir | wc -l)" &&
+ test_line_count_cmd --out = 3 git ls-files -u &&
+ test_line_count_cmd --out = 3 git ls-files -u dir &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -409,14 +399,15 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge and dir in t
git checkout -q renamed-file-has-conflicts^0 &&
test_must_fail git merge --strategy=recursive dir-in-way &&
- test 5 -eq "$(git ls-files -u | wc -l)" &&
+ test_line_count_cmd --out = 5 git ls-files -u &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 3 -eq "$(git ls-files -u dir~HEAD | wc -l)"
+ test_line_count_cmd --out = 3 git ls-files -u dir~HEAD
else
- test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)"
+ git ls-files -u dir >out &&
+ test_line_count_cmd --out = 3 grep -v file-in-the-way out
fi &&
- test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+ test_line_count_cmd --out = 2 git ls-files -u dir/file-in-the-way &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -432,14 +423,15 @@ test_expect_success 'Same as previous, but merged other way' '
git checkout -q dir-in-way^0 &&
test_must_fail git merge --strategy=recursive renamed-file-has-conflicts &&
- test 5 -eq "$(git ls-files -u | wc -l)" &&
+ test_line_count_cmd --out = 5 git ls-files -u &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 3 -eq "$(git ls-files -u dir~renamed-file-has-conflicts | wc -l)"
+ test_line_count_cmd --out = 3 git ls-files -u dir~renamed-file-has-conflicts
else
- test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)"
+ git ls-files -u dir >out &&
+ test_line_count_cmd --out = 3 grep -v file-in-the-way out
fi &&
- test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+ test_line_count_cmd --out = 2 git ls-files -u dir/file-in-the-way &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -496,9 +488,9 @@ test_expect_success 'both rename source and destination involved in D/F conflict
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 2 -eq "$(git ls-files -u | wc -l)"
+ test_line_count_cmd --out = 2 git ls-files -u
else
- test 1 -eq "$(git ls-files -u | wc -l)"
+ test_line_count_cmd --out = 1 git ls-files -u
fi &&
test_must_fail git diff --quiet &&
@@ -540,9 +532,9 @@ then
mkdir one &&
test_must_fail git merge --strategy=recursive rename-two &&
- test 4 -eq "$(git ls-files -u | wc -l)" &&
- test 2 -eq "$(git ls-files -u one | wc -l)" &&
- test 2 -eq "$(git ls-files -u two | wc -l)" &&
+ test_line_count_cmd --out = 4 git ls-files -u &&
+ test_line_count_cmd --out = 2 git ls-files -u one &&
+ test_line_count_cmd --out = 2 git ls-files -u two &&
test_must_fail git diff --quiet &&
@@ -559,9 +551,9 @@ else
mkdir one &&
test_must_fail git merge --strategy=recursive rename-two &&
- test 2 -eq "$(git ls-files -u | wc -l)" &&
- test 1 -eq "$(git ls-files -u one | wc -l)" &&
- test 1 -eq "$(git ls-files -u two | wc -l)" &&
+ test_line_count_cmd --out = 2 git ls-files -u &&
+ test_line_count_cmd --out = 1 git ls-files -u one &&
+ test_line_count_cmd --out = 1 git ls-files -u two &&
test_must_fail git diff --quiet &&
@@ -582,13 +574,13 @@ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ clean sta
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 4 -eq "$(git ls-files -u | wc -l)" &&
- test 2 -eq "$(git ls-files -u one | wc -l)" &&
- test 2 -eq "$(git ls-files -u two | wc -l)"
+ test_line_count_cmd --out = 4 git ls-files -u &&
+ test_line_count_cmd --out = 2 git ls-files -u one &&
+ test_line_count_cmd --out = 2 git ls-files -u two
else
- test 2 -eq "$(git ls-files -u | wc -l)" &&
- test 1 -eq "$(git ls-files -u one | wc -l)" &&
- test 1 -eq "$(git ls-files -u two | wc -l)"
+ test_line_count_cmd --out = 2 git ls-files -u &&
+ test_line_count_cmd --out = 1 git ls-files -u one &&
+ test_line_count_cmd --out = 1 git ls-files -u two
fi &&
test_must_fail git diff --quiet &&
@@ -631,19 +623,19 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 5 -eq "$(git ls-files -s | wc -l)" &&
- test 3 -eq "$(git ls-files -u | wc -l)" &&
- test 1 -eq "$(git ls-files -u one~HEAD | wc -l)" &&
- test 1 -eq "$(git ls-files -u two~second-rename | wc -l)" &&
- test 1 -eq "$(git ls-files -u original | wc -l)" &&
- test 0 -eq "$(git ls-files -o | wc -l)"
+ test_line_count_cmd --out = 5 git ls-files -s &&
+ test_line_count_cmd --out = 3 git ls-files -u &&
+ test_line_count_cmd --out = 1 git ls-files -u one~HEAD &&
+ test_line_count_cmd --out = 1 git ls-files -u two~second-rename &&
+ test_line_count_cmd --out = 1 git ls-files -u original &&
+ test_line_count_cmd --out = 2 git ls-files -o
else
- test 5 -eq "$(git ls-files -s | wc -l)" &&
- test 3 -eq "$(git ls-files -u | wc -l)" &&
- test 1 -eq "$(git ls-files -u one | wc -l)" &&
- test 1 -eq "$(git ls-files -u two | wc -l)" &&
- test 1 -eq "$(git ls-files -u original | wc -l)" &&
- test 2 -eq "$(git ls-files -o | wc -l)"
+ test_line_count_cmd --out = 5 git ls-files -s &&
+ test_line_count_cmd --out = 3 git ls-files -u &&
+ test_line_count_cmd --out = 1 git ls-files -u one &&
+ test_line_count_cmd --out = 1 git ls-files -u two &&
+ test_line_count_cmd --out = 1 git ls-files -u original &&
+ test_line_count_cmd --out = 4 git ls-files -o
fi &&
test_path_is_file one/file &&
@@ -679,11 +671,11 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
git checkout -q first-rename-redo^0 &&
test_must_fail git merge --strategy=recursive second-rename-redo &&
- test 3 -eq "$(git ls-files -u | wc -l)" &&
- test 1 -eq "$(git ls-files -u one | wc -l)" &&
- test 1 -eq "$(git ls-files -u two | wc -l)" &&
- test 1 -eq "$(git ls-files -u original | wc -l)" &&
- test 0 -eq "$(git ls-files -o | wc -l)" &&
+ test_line_count_cmd --out = 3 git ls-files -u &&
+ test_line_count_cmd --out = 1 git ls-files -u one &&
+ test_line_count_cmd --out = 1 git ls-files -u two &&
+ test_line_count_cmd --out = 1 git ls-files -u original &&
+ test_line_count_cmd --out = 2 git ls-files -o &&
test_path_is_file one &&
test_path_is_file two &&
@@ -861,8 +853,8 @@ test_expect_success 'setup merge of rename + small change' '
test_expect_success 'merge rename + small change' '
git merge rename_branch &&
- test 1 -eq $(git ls-files -s | wc -l) &&
- test 0 -eq $(git ls-files -o | wc -l) &&
+ test_line_count_cmd --out = 1 git ls-files -s &&
+ test_line_count_cmd --out = 2 git ls-files -o &&
test $(git rev-parse HEAD:renamed_file) = $(git rev-parse HEAD~1:file)
'
--
2.32.0.278.gd42b80f139
next prev parent reply other threads:[~2021-06-12 4:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-12 4:27 [PATCH 0/4] t: new helper test_line_count_cmd Đoàn Trần Công Danh
2021-06-12 4:27 ` [PATCH 1/4] test-lib-functions: introduce test_line_count_cmd Đoàn Trần Công Danh
2021-06-13 3:10 ` Eric Sunshine
2021-06-13 7:36 ` Đoàn Trần Công Danh
2021-06-13 13:28 ` Ævar Arnfjörð Bjarmason
2021-06-13 16:37 ` Đoàn Trần Công Danh
2021-06-13 18:18 ` Phillip Wood
2021-06-13 21:42 ` Felipe Contreras
2021-06-13 23:43 ` Eric Sunshine
2021-06-14 2:56 ` Junio C Hamano
2021-06-24 23:19 ` Ævar Arnfjörð Bjarmason
2021-06-13 13:36 ` Ævar Arnfjörð Bjarmason
2021-06-14 3:01 ` Junio C Hamano
2021-06-15 15:40 ` Đoàn Trần Công Danh
2021-06-12 4:27 ` [PATCH 2/4] t6402: use find(1) builtin to filter instead of grep Đoàn Trần Công Danh
2021-06-12 4:27 ` [PATCH 3/4] t6400: use test_line_count_cmd to count # of lines in stdout Đoàn Trần Công Danh
2021-06-12 4:33 ` Bagas Sanjaya
2021-06-13 7:39 ` Đoàn Trần Công Danh
2021-06-13 3:39 ` Eric Sunshine
2021-06-13 7:42 ` Đoàn Trần Công Danh
2021-06-12 4:27 ` Đoàn Trần Công Danh [this message]
2021-06-13 3:43 ` [PATCH 4/4] t6402: " Eric Sunshine
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=20210612042755.28342-5-congdanhqx@gmail.com \
--to=congdanhqx@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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).