[PATCH 21/21] t5523: use test_i18ngrep for negation
- From
Vasco Almeida <vascomalmeida@sapo.pt>
- Date
- May 18, 2016, 15:27 UTC
- Message-ID
- <1463585274-9027-22-git-send-email-vascomalmeida@sapo.pt>
- In-Reply-To
- <1463585274-9027-1-git-send-email-vascomalmeida@sapo.pt>
Replace the first form by the second one: ! grep expected actual test_i18ngrep ! expected actual
The latter syntax is supported by test_i18ngrep defined in t/test-lib.sh.
Although the test already passes whether GETTEXT_POSION is enabled, use the i18n grep variant for the sake of consistency and also to make obvious that those strings are subject to i18n.
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> --- t/t5523-push-upstream.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh index 4a7b98b..d6981ba 100755 --- a/t/t5523-push-upstream.sh +++ b/t/t5523-push-upstream.sh @@ -83,7 +83,7 @@ test_expect_success 'progress messages do not go to non-tty' ' # skip progress messages, since stderr is non-tty git push -u upstream master >out 2>err && - ! grep "Writing objects" err + test_i18ngrep ! "Writing objects" err ' test_expect_success 'progress messages go to non-tty (forced)' ' @@ -98,15 +98,15 @@ test_expect_success TTY 'push -q suppresses progress' ' ensure_fresh_upstream && test_terminal git push -u -q upstream master >out 2>err && - ! grep "Writing objects" err + test_i18ngrep ! "Writing objects" err ' test_expect_success TTY 'push --no-progress suppresses progress' ' ensure_fresh_upstream && test_terminal git push -u --no-progress upstream master >out 2>err && - ! grep "Unpacking objects" err && - ! grep "Writing objects" err + test_i18ngrep ! "Unpacking objects" err && + test_i18ngrep ! "Writing objects" err ' test_expect_success TTY 'quiet push' '
-- 2.7.3