Re: [PATCH v2 6/7] Fix tests under GETTEXT_POISON on git-remote
Jiang Xin worldhello@gmail.com writes: Use i18n-specific test functions in test scripts for git-remote. This issue was was introduced in v1.7.10-233-gbb16d5: bb16d5 i18n: remote: mark strings for translation and been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Jiang Xin worldhello@gmail.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- ... @@ -77,6 +75,14 @@ test_expect_success 'add another remote' ' ) ' +test_expect_success C_LOCALE_OUTPUT 'add another remote' ' +( + cd test + check_remote_track origin master side + check_remote_track second master side another +) +' This couldn't have possibly passed with the trailing , or am I missing something? There is already add another remote before this test that adds second remote. Is this test about add yet another remote, or is it checking the result of adding second that was done in the previous step? Will queue with an obvious fix-up with retitle, 'check tracking', or something. Thanks. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 6/7] Fix tests under GETTEXT_POISON on git-remote
2012/8/28 Junio C Hamano gits...@pobox.com:
Jiang Xin worldhello@gmail.com writes:
Use i18n-specific test functions in test scripts for git-remote.
This issue was was introduced in v1.7.10-233-gbb16d5:
bb16d5 i18n: remote: mark strings for translation
and been broken under GETTEXT_POISON=YesPlease since.
Signed-off-by: Jiang Xin worldhello@gmail.com
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
...
@@ -77,6 +75,14 @@ test_expect_success 'add another remote' '
)
'
+test_expect_success C_LOCALE_OUTPUT 'add another remote' '
+(
+ cd test
+ check_remote_track origin master side
+ check_remote_track second master side another
+)
+'
This couldn't have possibly passed with the trailing , or am I
missing something? There is already add another remote before
this test that adds second remote. Is this test about add
yet another remote, or is it checking the result of adding second
that was done in the previous step?
The trailing “ is a copy paste error. I only run my fixup in
GIT_GETTEXT_POISON mode in a harry, not noticed the bypassed
testcase has this serious bug.
I split the original add another remote into two blocks. One is a
normal testcase, and another has a C_LOCALE_OUTPUT prereq
flag. This is because other testcases depend on the operations in
add another remote testcase ('git remote add -f second ../two'),
and these testcases would fail if add C_LOCALE_OUTPUT
prereq to the whole add another remote testcase.
Will queue with an obvious fix-up with retitle, 'check tracking', or
something.
Thanks.
--
蒋鑫
北京群英汇信息技术有限公司
邮件: worldhello@gmail.com
网址: http://www.ossxp.com/
博客: http://www.worldhello.net/
微博: http://weibo.com/gotgit/
电话: 010-51262007, 18601196889
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 6/7] Fix tests under GETTEXT_POISON on git-remote
Use i18n-specific test functions in test scripts for git-remote. This issue was was introduced in v1.7.10-233-gbb16d5: bb16d5 i18n: remote: mark strings for translation and been broken under GETTEXT_POISON=YesPlease since. Signed-off-by: Jiang Xin worldhello@gmail.com Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- t/t5505-remote.sh | 28 +--- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index e8af6..7f0cb 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -52,7 +52,7 @@ test_expect_success setup ' ' -test_expect_success 'remote information for the origin' ' +test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' ' ( cd test tokens_match origin $(git remote) @@ -66,8 +66,6 @@ test_expect_success 'add another remote' ' cd test git remote add -f second ../two tokens_match origin second $(git remote) - check_remote_track origin master side - check_remote_track second master side another check_tracking_branch second master side another git for-each-ref --format=%(refname) refs/remotes | sed -e /^refs\/remotes\/origin\//d \ @@ -77,6 +75,14 @@ test_expect_success 'add another remote' ' ) ' +test_expect_success C_LOCALE_OUTPUT 'add another remote' ' +( + cd test + check_remote_track origin master side + check_remote_track second master side another +) +' + test_expect_success 'remote forces tracking branches' ' ( cd test @@ -95,7 +101,7 @@ test_expect_success 'remove remote' ' ) ' -test_expect_success 'remove remote' ' +test_expect_success C_LOCALE_OUTPUT 'remove remote' ' ( cd test tokens_match origin $(git remote) @@ -131,8 +137,8 @@ EOF git remote rm oops 2actual2 git branch -d foobranch git tag -d footag - test_cmp expect1 actual1 - test_cmp expect2 actual2 + test_i18ncmp expect1 actual1 + test_i18ncmp expect2 actual2 ) ' @@ -192,7 +198,7 @@ test_expect_success 'show' ' git config --add remote.two.push refs/heads/master:refs/heads/another git remote show origin two output git branch -d rebase octopus -test_cmp expect output) +test_i18ncmp expect output) ' cat test/expect EOF @@ -217,7 +223,7 @@ test_expect_success 'show -n' ' cd test git remote show -n origin output mv ../one.unreachable ../one -test_cmp expect output) +test_i18ncmp expect output) ' test_expect_success 'prune' ' @@ -255,7 +261,7 @@ EOF test_expect_success 'set-head --auto fails w/multiple HEADs' ' (cd test test_must_fail git remote set-head --auto two output 21 - test_cmp expect output) + test_i18ncmp expect output) ' cat test/expect EOF @@ -285,7 +291,7 @@ test_expect_success 'prune --dry-run' ' test_must_fail git rev-parse refs/remotes/origin/side (cd ../one git branch -m side side2) -test_cmp expect output) +test_i18ncmp expect output) ' test_expect_success 'add --mirror prune' ' @@ -705,7 +711,7 @@ test_expect_success 'remote prune to cause a dangling symref' ' cd seven git remote prune origin ) err 21 - grep has become dangling err + test_i18ngrep has become dangling err : And the dangling symref will not cause other annoying errors ( -- 1.7.12.92.gaa91cb5 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
