Re: [PATCH 3/4] t6400: use test_line_count_cmd to count # of lines in stdout
From: Eric Sunshine <hidden>
Date: 2021-06-13 03:40:35
On Sat, Jun 12, 2021 at 12:28 AM Đoàn Trần Công Danh [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Đoàn Trần Công Danh <redacted> ---diff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh@@ -82,13 +82,13 @@ test_expect_success 'modify/delete + directory/file conflict' ' - test 5 -eq $(git ls-files -s | wc -l) && - test 4 -eq $(git ls-files -u | wc -l) && + test_line_count_cmd --out = 5 git ls-files -s && + test_line_count_cmd --out = 4 git ls-files -u &&
Nit: too many spaces before the `&&` on the second line: s/\s+/ /
quoted hunk ↗ jump to hunk
@@ -103,13 +103,13 @@ test_expect_success 'modify/delete + directory/file conflict; other way' ' - test 5 -eq $(git ls-files -s | wc -l) && - test 4 -eq $(git ls-files -u | wc -l) && + test_line_count_cmd --out = 5 git ls-files -s && + test_line_count_cmd --out = 4 git ls-files -u &&
Nit: too many spaces before the `&&` on both lines.