From: Mehul Jain <mehul.jain2029@gmail.com>
To: git@vger.kernel.org
Cc: sunshine@sunshineco.com, Matthieu.Moy@grenoble-inp.fr,
gitster@pobox.com, Mehul Jain <mehul.jain2029@gmail.com>
Subject: [PATCH 3/5] t/t5520: use test_i18ngrep instead of test_cmp
Date: Tue, 29 Mar 2016 18:59:58 +0530 [thread overview]
Message-ID: <1459258200-32444-4-git-send-email-mehul.jain2029@gmail.com> (raw)
In-Reply-To: <1459258200-32444-1-git-send-email-mehul.jain2029@gmail.com>
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 <mehul.jain2029@gmail.com>
---
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
next prev parent reply other threads:[~2016-03-29 13:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-29 13:29 [PATCH 0/5] modify tests for --[no-]autostash option Mehul Jain
2016-03-29 13:29 ` [PATCH 1/5] t/t5520: change rebase.autoStash to rebase.autostash Mehul Jain
2016-03-29 20:06 ` Eric Sunshine
2016-03-29 13:29 ` [PATCH 2/5] t/t5520: explicitly unset rebase.autostash Mehul Jain
2016-03-29 20:16 ` Eric Sunshine
2016-03-29 13:29 ` Mehul Jain [this message]
2016-03-29 20:27 ` [PATCH 3/5] t/t5520: use test_i18ngrep instead of test_cmp Eric Sunshine
2016-03-29 13:29 ` [PATCH 4/5] t/t5520: modify tests to reduce common code Mehul Jain
2016-03-29 20:13 ` Junio C Hamano
2016-03-29 21:01 ` Eric Sunshine
2016-03-29 13:30 ` [PATCH 5/5] t/t5520: test --[no-]autostash with pull.rebase=true Mehul Jain
2016-03-29 21:16 ` Eric Sunshine
2016-03-30 19:00 ` Mehul Jain
2016-03-30 20:31 ` Eric Sunshine
2016-04-01 10:27 ` Mehul Jain
2016-04-03 19:28 ` Eric Sunshine
2016-04-04 16:42 ` Mehul Jain
2016-04-04 16:52 ` Matthieu Moy
2016-04-04 17:36 ` Mehul Jain
2016-04-04 17:48 ` Eric Sunshine
2016-04-04 18:25 ` Matthieu Moy
2016-04-04 18:21 ` Matthieu Moy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459258200-32444-4-git-send-email-mehul.jain2029@gmail.com \
--to=mehul.jain2029@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).