development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 18:59:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

t5520: use better test to check stderr output

Browse source 
Checking stderr output using test_i18ncmp may lead to test failure as
some shells write trace output to stderr when run under 'set -x'.

Use test_i18ngrep instead of test_i18ncmp.

Signed-off-by: Mehul Jain <mehul.jain2029@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mehul Jain 2016-04-02 23:28:28 +05:30 committed by Junio C Hamano
parent eff960b3af
commit 6ddc97c7dc
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
t/t5520-pull.sh
View file

@ -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_expect_success 'pull --autostash (without --rebase) should error out' '
test_must_fail git pull --autostash . copy 2>actual && test_must_fail git pull --autostash . copy 2>err &&
echo "fatal: --[no-]autostash option is only valid with --rebase." >expect && test_i18ngrep "only valid with --rebase" err
test_i18ncmp actual expect
' '
test_expect_success 'pull --no-autostash (without --rebase) should error out' ' test_expect_success 'pull --no-autostash (without --rebase) should error out' '
test_must_fail git pull --no-autostash . copy 2>actual && test_must_fail git pull --no-autostash . copy 2>err &&
echo "fatal: --[no-]autostash option is only valid with --rebase." >expect && test_i18ngrep "only valid with --rebase" err
test_i18ncmp actual expect
' '
test_expect_success 'pull.rebase' ' test_expect_success 'pull.rebase' '