From: Eric Sunshine <sunshine@sunshineco.com>
Date: Thu, 19 May 2016 18:34:29 GMT
Subject: Re: [PATCH 19/21] t9003: become resilient to GETTEXT_POISON
Message-ID: <CAPig+cT3yf7D4xOmOhy5Y21qwHuA5Ny9ULEJhC1OBgrhiayQ3g@mail.gmail.com>
In-Reply-To: <1463585274-9027-20-git-send-email-vascomalmeida@sapo.pt>

On Wed, May 18, 2016 at 11:27 AM, Vasco Almeida <vascomalmeida@sapo.pt> wrote:
> The test t9003-help-autocorrect.sh fails when run under GETTEXT_POISON,
> because it's expecting to filter out the original output. Accommodate
> gettext poison case by also filtering out the default simulated output.
>
> Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
> ---
> diff --git a/t/t9003-help-autocorrect.sh b/t/t9003-help-autocorrect.sh
> @@ -31,10 +31,14 @@ test_expect_success 'autocorrect showing candidates' '
>         git config help.autocorrect 0 &&
>
>         test_must_fail git lfg 2>actual &&
> -       sed -e "1,/^Did you mean this/d" actual | grep lgf &&
> +       sed -e "1,/^Did you mean this/d" actual |
> +       sed -e "/GETTEXT POISON/d" actual |

Why not do so with a single sed invocation?

   sed -e "..." -e "..." |

> +       grep lgf &&
>
>         test_must_fail git distimdist 2>actual &&
> -       sed -e "1,/^Did you mean this/d" actual | grep distimdistim
> +       sed -e "1,/^Did you mean this/d" actual |
> +       sed -e "/GETTEXT POISON/d" actual |

Ditto.

> +       grep distimdistim
>  '