[PATCH v2 05/21] t3600: use test_line_count() where possible
- From
Denton Liu <liu.denton@gmail.com>
- Date
- Nov 21, 2019, 00:45 UTC
- Message-ID
- <97ad3604dd9a84f20d4913e69bf2b16a6f7c5103.1574296987.git.liu.denton@gmail.com>
- In-Reply-To
- <cover.1574296987.git.liu.denton@gmail.com>
Since we have a helper function that can test the number of lines in a file that gives better debugging information on failure, use test_line_count() to test the number of lines.
Signed-off-by: Denton Liu <liu.denton@gmail.com> --- t/t3600-rm.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index 8c8cca5bfb..f6e659b7e9 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -113,9 +113,10 @@ test_expect_success '"rm" command printed' ' echo frotz >test-file && git add test-file && git commit -m "add file for rm test" && - git rm test-file >rm-output && - test $(grep "^rm " rm-output | wc -l) = 1 && - rm -f test-file rm-output && + git rm test-file >rm-output.raw && + grep "^rm " rm-output.raw >rm-output && + test_line_count = 1 rm-output && + rm -f test-file rm-output.raw rm-output && git commit -m "remove file from rm test" '
-- 2.24.0.450.g7a9a4598a9