Re: [PATCHv4 02/15] t4017 (diff-retval): replace manual exit code check with test_expect_code
On Wed, Sep 29, 2010 at 18:07, Junio C Hamano <gitster@pobox.com> wrote:
Show 21 quoted lines
> Elijah Newren <newren@gmail.com> writes:
>
>> Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>> Signed-off-by: Elijah Newren <newren@gmail.com>
>> ---
>> t/t4017-diff-retval.sh | 30 ++++++++++--------------------
>> 1 files changed, 10 insertions(+), 20 deletions(-)
>>
>> diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
>> index 6158985..6605e12 100755
>> --- a/t/t4017-diff-retval.sh
>> +++ b/t/t4017-diff-retval.sh
>> @@ -28,37 +28,29 @@ test_expect_success 'git diff --quiet -w HEAD^ HEAD' '
>> test_must_fail git diff --quiet -w HEAD^ HEAD
>> '
>>
>> -test_expect_success 'git diff-tree HEAD^ HEAD' '
>> +test_expect_code 1 'git diff-tree HEAD^ HEAD' '
>> git diff-tree --exit-code HEAD^ HEAD
>> - test $? = 1
>> '
It also looks like this will pass for for all exit codes that *aren't*
1, because if $? != 1 +test_expect_code will get the exit code of
1. But if it's 1 then test $? = 0 will return 0, right?
Show 8 quoted lines
>> -test_expect_success 'git diff-tree HEAD^ HEAD -- a' '
>> +test_expect_code 0 'git diff-tree HEAD^ HEAD -- a' '
>> git diff-tree --exit-code HEAD^ HEAD -- a
>> - test $? = 0
>> '
>
> It probably is better to simply drop "test $? = 0" and keep the
> expect-success, no?
Ævar Arnfjörð Bjarmason <avarab@gmail.com>