diff options
| author |  Mehul Jain <mehul.jain2029@gmail.com> | 2016-04-02 23:28:28 +0530 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-04 11:07:58 -0700 |
| commit | 6ddc97c7dc11076be30846c13666e5bc1844629a (patch) | |
| tree | 74fc83879e3dcc04a71d94a06f245ba196645b66 | |
| parent | t5520: ensure consistent test conditions (diff) | |
| download | tgif-6ddc97c7dc11076be30846c13666e5bc1844629a.tar.xz | |
t5520: use better test to check stderr output
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>
| -rwxr-xr-x | t/t5520-pull.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 9ee22185f3..d03cb842e2 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' ' |