[PATCH 2/2] t0030-t0050: avoid pipes with Git on LHS
- From
Shubham Mishra <shivam828787@gmail.com>
- Date
- Feb 24, 2022, 05:47 UTC
- Message-ID
- <20220224054720.23996-3-shivam828787@gmail.com>
- In-Reply-To
- <20220224054720.23996-1-shivam828787@gmail.com>
Pipes ignore error codes of LHS command and thus we should not use them with Git in tests. As an alternative, use a 'tmp' file to write the Git output so we can test the exit code.
Signed-off-by: Shubham Mishra <shivam828787@gmail.com> --- t/t0030-stripspace.sh | 81 ++++++++++++++++++++++++++++--------------- t/t0050-filesystem.sh | 3 +- 2 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh index ae1ca380c1..4d0af9bf98 100755 --- a/t/t0030-stripspace.sh +++ b/t/t0030-stripspace.sh @@ -225,32 +225,48 @@ test_expect_success \ test_expect_success \ 'text without newline at end should end with newline' ' - test $(printf "$ttt" | git stripspace | wc -l) -gt 0 && - test $(printf "$ttt$ttt" | git stripspace | wc -l) -gt 0 && - test $(printf "$ttt$ttt$ttt" | git stripspace | wc -l) -gt 0 && - test $(printf "$ttt$ttt$ttt$ttt" | git stripspace | wc -l) -gt 0 + printf "$ttt" | git stripspace >tmp && + test $(wc -l <tmp) -gt 0 && + printf "$ttt$ttt" | git stripspace >tmp && + test $(wc -l <tmp) -gt 0 && + printf "$ttt$ttt$ttt" | git stripspace >tmp && + test $(wc -l <tmp) -gt 0 && + printf "$ttt$ttt$ttt$ttt" | git stripspace >tmp && + test $(wc -l <tmp) -gt 0 ' # text plus spaces at the end: test_expect_success \ 'text plus spaces without newline at end should end with newline' ' - test $(printf "$ttt$sss" | git stripspace | wc -l) -gt 0 && - test $(printf "$ttt$ttt$sss" | git stripspace | wc -l) -gt 0 && - test $(printf "$ttt$ttt$ttt$sss" | git stripspace | wc -l) -gt 0 && - test $(printf "$ttt$sss$sss" | git stripspace | wc -l) -gt 0 && - test $(printf "$ttt$ttt$sss$sss" | git stripspace | wc -l) -gt 0 && - test $(printf "$ttt$sss$sss$sss" | git stripspace | wc -l) -gt 0 + printf "$ttt$sss" | git stripspace >tmp && + test $(wc -l <tmp) -gt 0 && + printf "$ttt$ttt$sss" | git stripspace >tmp && + test $(wc -l <tmp) -gt 0 && + printf "$ttt$ttt$ttt$sss" | git stripspace >tmp && + test $(wc -l <tmp) -gt 0 && + printf "$ttt$sss$sss" | git stripspace >tmp && + test $(wc -l <tmp) -gt 0 && + printf "$ttt$ttt$sss$sss" | git stripspace >tmp && + test $(wc -l <tmp) -gt 0 && + printf "$ttt$sss$sss$sss" | git stripspace >tmp && + test $(wc -l <tmp) -gt 0 ' test_expect_success \ 'text plus spaces without newline at end should not show spaces' ' - ! (printf "$ttt$sss" | git stripspace | grep " " >/dev/null) && - ! (printf "$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) && - ! (printf "$ttt$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) && - ! (printf "$ttt$sss$sss" | git stripspace | grep " " >/dev/null) && - ! (printf "$ttt$ttt$sss$sss" | git stripspace | grep " " >/dev/null) && - ! (printf "$ttt$sss$sss$sss" | git stripspace | grep " " >/dev/null) + printf "$ttt$sss" | git stripspace >tmp && + ! (grep " " tmp >/dev/null) && + printf "$ttt$ttt$sss" | git stripspace && + ! (grep " " tmp >/dev/null) && + printf "$ttt$ttt$ttt$sss" | git stripspace && + ! (grep " " tmp >/dev/nul) && + printf "$ttt$sss$sss" | git stripspace && + ! (grep " " tmp >/dev/null) && + printf "$ttt$ttt$sss$sss" | git stripspace && + ! (grep " " tmp >/dev/null) && + printf "$ttt$sss$sss$sss" | git stripspace && + ! (grep " " tmp >/dev/null) ' test_expect_success \ @@ -282,12 +298,18 @@ test_expect_success \ test_expect_success \ 'text plus spaces at end should not show spaces' ' - ! (echo "$ttt$sss" | git stripspace | grep " " >/dev/null) && - ! (echo "$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) && - ! (echo "$ttt$ttt$ttt$sss" | git stripspace | grep " " >/dev/null) && - ! (echo "$ttt$sss$sss" | git stripspace | grep " " >/dev/null) && - ! (echo "$ttt$ttt$sss$sss" | git stripspace | grep " " >/dev/null) && - ! (echo "$ttt$sss$sss$sss" | git stripspace | grep " " >/dev/null) + echo "$ttt$sss" | git stripspace >tmp && + ! (grep " " tmp >/dev/null) && + echo "$ttt$ttt$sss" | git stripspace >tmp && + ! (grep " " tmp>/dev/null) && + echo "$ttt$ttt$ttt$sss" && + ! (grep " " tmp >/dev/null) && + echo "$ttt$sss$sss" | git stripspace >tmp && + ! (grep " " tmp >/dev/null) && + echo "$ttt$ttt$sss$sss" | git stripspace >tmp && + ! (grep " " tmp >/dev/null) && + echo "$ttt$sss$sss$sss" | git stripspace >tmp && + ! (grep " " tmp >/dev/null) ' test_expect_success \ @@ -339,11 +361,16 @@ test_expect_success \ test_expect_success \ 'spaces without newline at end should not show spaces' ' - ! (printf "" | git stripspace | grep " " >/dev/null) && - ! (printf "$sss" | git stripspace | grep " " >/dev/null) && - ! (printf "$sss$sss" | git stripspace | grep " " >/dev/null) && - ! (printf "$sss$sss$sss" | git stripspace | grep " " >/dev/null) && - ! (printf "$sss$sss$sss$sss" | git stripspace | grep " " >/dev/null) + printf "" | git stripspace >tmp && + ! ( grep " " tmp >/dev/null) && + printf "$sss" | git stripspace >tmp && + ! ( grep " " tmp >/dev/null) && + printf "$sss$sss" | git stripspace >tmp && + ! (grep " " tmp >/dev/null) && + printf "$sss$sss$sss" | git stripspace >tmp && + ! (grep " " tmp >/dev/null) && + printf "$sss$sss$sss$sss" | git stripspace >tmp && + ! (grep " " tmp >/dev/null) ' test_expect_success \ diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index afc343cf9b..5c9dc90d0b 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -104,7 +104,8 @@ test_expect_failure CASE_INSENSITIVE_FS 'add (with different case)' ' rm camelcase && echo 1 >CamelCase && git add CamelCase && - camel=$(git ls-files | grep -i camelcase) && + git ls-files >tmp && + camel=$(grep -i camelcase tmp) && test $(echo "$camel" | wc -l) = 1 && test "z$(git cat-file blob :$camel)" = z1 '
-- 2.25.1