On Thu, Apr 5, 2018 at 6:48 PM, Johannes Schindelin
<johannes.schinde...@gmx.de> wrote:
> This actually only tests whether the push errors/hints are colored if
> the respective color.* config settings are `always`, but in the regular
> case they default to `auto` (in which case we color the messages when
> stderr is connected to an interactive terminal), therefore these tests
> should suffice.
>
> Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
> ---
> diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
> @@ -377,5 +377,23 @@ test_expect_success 'push status output scrubs password' 
> '
> +test_expect_success 'colorize errors/hints' '
> +       cd "$ROOT_PATH"/test_repo_clone &&
> +       cat >exp <<-EOF &&
> +       To http://127.0.0.1:$LIB_HTTPD_PORT/smart/test_repo.git
> +        <RED>! [rejected]       <RESET> origin/master^ -> master 
> (non-fast-forward)
> +       error: failed to push some refs to 
> '\''http://127.0.0.1:$LIB_HTTPD_PORT/smart/test_repo.git'\''
> +       EOF

This "exp" file is not used by the test.

> +       test_must_fail git -c color.transport=always -c color.advice=always \
> +               -c color.push=always \
> +               push origin origin/master^:master 2>act &&
> +       test_decode_color <act >decoded &&
> +       test_i18ngrep "<RED>.*rejected.*<RESET>" decoded &&
> +       test_i18ngrep "<RED>error: failed to push some refs" decoded &&
> +       test_i18ngrep "<YELLOW>hint: " decoded &&
> +       test_i18ngrep ! "^hint: " decoded
> +'

Reply via email to