Re: [PATCH 3/5] t/t5520: use test_i18ngrep instead of test_cmp

[Eric Sunshine]

On Tue, Mar 29, 2016 at 9:29 AM, Mehul Jain  wrote:
> t/t5520: use test_i18ngrep instead of test_cmp

As mentioned for earlier patches, this is too low-level, whereas it
should be giving a high-level overview.

> test_cmp is used for error checking when test_i18ngrep could be used.
>
> Use test_i18ngrep to check for the valid error.

"could be used" is not sufficient justification to explain why this
change is desirable. See [1] for a good explanation of why this change
should be made.

The patch itself looks fine.

[1]: http://article.gmane.org/gmane.comp.version-control.git/289077

> Signed-off-by: Mehul Jain 
> ---
>  t/t5520-pull.sh | 10 --
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
> index 9ee2218..d03cb84 100755
> --- a/t/t5520-pull.sh
> +++ b/t/t5520-pull.sh
> @@ -317,15 +317,13 @@ test_expect_success 'pull --rebase --no-autostash & 
> rebase.autostash unset' '
>  '
>
>  test_expect_success 'pull --autostash (without --rebase) should error out' '
> -   test_must_fail git pull --autostash . copy 2>actual &&
> -   echo "fatal: --[no-]autostash option is only valid with --rebase." 
> >expect &&
> -   test_i18ncmp actual expect
> +   test_must_fail git pull --autostash . copy 2>err &&
> +   test_i18ngrep "only valid with --rebase" err
>  '
>
>  test_expect_success 'pull --no-autostash (without --rebase) should error 
> out' '
> -   test_must_fail git pull --no-autostash . copy 2>actual &&
> -   echo "fatal: --[no-]autostash option is only valid with --rebase." 
> >expect &&
> -   test_i18ncmp actual expect
> +   test_must_fail git pull --no-autostash . copy 2>err &&
> +   test_i18ngrep "only valid with --rebase" err
>  '
>
>  test_expect_success 'pull.rebase' '
> --
> 2.7.1.340.g69eb491.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 3/5] t/t5520: use test_i18ngrep instead of test_cmp

[Mehul Jain]

test_cmp is used for error checking when test_i18ngrep could be used.

Use test_i18ngrep to check for the valid error.

Signed-off-by: Mehul Jain 
---
 t/t5520-pull.sh | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 9ee2218..d03cb84 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -317,15 +317,13 @@ test_expect_success 'pull --rebase --no-autostash & 
rebase.autostash unset' '
 '
 
 test_expect_success 'pull --autostash (without --rebase) should error out' '
-   test_must_fail git pull --autostash . copy 2>actual &&
-   echo "fatal: --[no-]autostash option is only valid with --rebase." 
>expect &&
-   test_i18ncmp actual expect
+   test_must_fail git pull --autostash . copy 2>err &&
+   test_i18ngrep "only valid with --rebase" err
 '
 
 test_expect_success 'pull --no-autostash (without --rebase) should error out' '
-   test_must_fail git pull --no-autostash . copy 2>actual &&
-   echo "fatal: --[no-]autostash option is only valid with --rebase." 
>expect &&
-   test_i18ncmp actual expect
+   test_must_fail git pull --no-autostash . copy 2>err &&
+   test_i18ngrep "only valid with --rebase" err
 '
 
 test_expect_success 'pull.rebase' '
-- 
2.7.1.340.g69eb491.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html