Re: [PATCH 2/5] t6036, t6042: use test_line_count instead of wc -l
On Thu, May 24, 2018 at 12:05 PM, SZEDER Gábor <szeder.dev@gmail.com> wrote:
Show 31 quoted lines
>
>> Signed-off-by: Elijah Newren <newren@gmail.com>
>> ---
>> t/t6036-recursive-corner-cases.sh | 102 ++++++++++++++++++---------
>> t/t6042-merge-rename-corner-cases.sh | 99 +++++++++++++++++---------
>> 2 files changed, 134 insertions(+), 67 deletions(-)
>>
>> diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
>> index cfe6a99771..3e659cff28 100755
>> --- a/t/t6036-recursive-corner-cases.sh
>> +++ b/t/t6036-recursive-corner-cases.sh
>> @@ -65,9 +65,12 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' '
>>
>> test_must_fail git merge -s recursive R2^0 &&
>>
>> - test 2 = $(git ls-files -s | wc -l) &&
>> - test 2 = $(git ls-files -u | wc -l) &&
>> - test 2 = $(git ls-files -o | wc -l) &&
>
> Here 'git ls-files -o' should have listed two untracked files ...
>
>> + git ls-files -s >out &&
>> + test_line_count = 2 out &&
>> + git ls-files -u >out &&
>> + test_line_count = 2 out &&
>> + git ls-files -o >out &&
>> + test_line_count = 3 out &&
>
> ... but now you expect it to list three. I was about to point out the
> typo, but then noticed that you expect it to list one more untracked
> file than before in all subsequent tests...
Hrm, not all, actually, because there is this one exception:
>> @@ -426,10 +444,14 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '
>> test_must_fail git merge -s recursive C^0 >out &&
Note that the file 'out' is created here ...
Show 6 quoted lines
>> test_i18ngrep "CONFLICT (rename/rename)" out &&
>>
>> - test 2 -eq $(git ls-files -s | wc -l) &&
>> - test 2 -eq $(git ls-files -u | wc -l) &&
>> - test 2 -eq $(git ls-files -u c | wc -l) &&
>> - test 3 -eq $(git ls-files -o | wc -l) &&
... so this 'git ls-files -o' already lists it as well, ...
Show 8 quoted lines
>> + git ls-files -s >out &&
>> + test_line_count = 2 out &&
>> + git ls-files -u >out &&
>> + test_line_count = 2 out &&
>> + git ls-files -u c >out &&
>> + test_line_count = 2 out &&
>> + git ls-files -o >out &&
>> + test_line_count = 3 out &&
... therefore the number of untracked files here remains unchanged.
>>
>> test ! -f a &&
>> test ! -f b &&
SZEDER Gábor <szeder.dev@gmail.com>