From c7cf956618c4af9f3151a90d7552b05767e6444f Mon Sep 17 00:00:00 2001 From: Pranit Bauva Date: Wed, 4 Jan 2017 01:27:07 +0530 Subject: don't use test_must_fail with grep test_must_fail should only be used for testing git commands. To test the failure of other commands use `!`. Reported-by: Stefan Beller Signed-off-by: Pranit Bauva Signed-off-by: Junio C Hamano --- t/t9813-git-p4-preserve-users.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 't/t9813-git-p4-preserve-users.sh') diff --git a/t/t9813-git-p4-preserve-users.sh b/t/t9813-git-p4-preserve-users.sh index 0fe2312807..76004a5ad6 100755 --- a/t/t9813-git-p4-preserve-users.sh +++ b/t/t9813-git-p4-preserve-users.sh @@ -126,13 +126,13 @@ test_expect_success 'not preserving user with mixed authorship' ' grep "git author charlie@example.com does not match" && make_change_by_user usernamefile3 alice alice@example.com && - git p4 commit |\ - test_must_fail grep "git author.*does not match" && + git p4 commit >actual && + ! grep "git author.*does not match" actual && git config git-p4.skipUserNameCheck true && make_change_by_user usernamefile3 Charlie charlie@example.com && - git p4 commit |\ - test_must_fail grep "git author.*does not match" && + git p4 commit >actual && + ! grep "git author.*does not match" actual && p4_check_commit_author usernamefile3 alice ) -- cgit v1.2.3 From c6f44e1da5e88e34654ae37c62eea2d08835110b Mon Sep 17 00:00:00 2001 From: Pranit Bauva Date: Wed, 4 Jan 2017 01:27:08 +0530 Subject: t9813: avoid using pipes The exit code of the upstream in a pipe is ignored thus we should avoid using it. By writing out the output of the git command to a file, we can test the exit codes of both the commands. Signed-off-by: Pranit Bauva Acked-by: Luke Diamand Signed-off-by: Junio C Hamano --- t/t9813-git-p4-preserve-users.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 't/t9813-git-p4-preserve-users.sh') diff --git a/t/t9813-git-p4-preserve-users.sh b/t/t9813-git-p4-preserve-users.sh index 76004a5ad6..bda222aa02 100755 --- a/t/t9813-git-p4-preserve-users.sh +++ b/t/t9813-git-p4-preserve-users.sh @@ -118,12 +118,12 @@ test_expect_success 'not preserving user with mixed authorship' ' make_change_by_user usernamefile3 Derek derek@example.com && P4EDITOR=cat P4USER=alice P4PASSWD=secret && export P4EDITOR P4USER P4PASSWD && - git p4 commit |\ - grep "git author derek@example.com does not match" && + git p4 commit >actual && + grep "git author derek@example.com does not match" actual && make_change_by_user usernamefile3 Charlie charlie@example.com && - git p4 commit |\ - grep "git author charlie@example.com does not match" && + git p4 commit >actual && + grep "git author charlie@example.com does not match" actual && make_change_by_user usernamefile3 alice alice@example.com && git p4 commit >actual && -- cgit v1.2.3