From: Junio C Hamano Date: Thu, 26 Jan 2012 19:40:09 +0000 (-0800) Subject: t9801: do not overuse test_must_fail X-Git-Tag: v1.7.10-rc0~127^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e7d7a56796c457b0a96e58e7638950db824b52af;p=git.git t9801: do not overuse test_must_fail test_must_fail is to make sure a program we can potentially break during the course of updating git itself exits with a non-zero status in a clean and controlled way. When we expect a non-zero exit status from the commands we use from the underlying platform in tests, e.g. making sure a string "error: " does not appear in the output by running "grep 'error: '", just use "! grep" for readability. It is not like we will try to update Git and suddenly 'grep' we use from the system starts segfaulting. Signed-off-by: Junio C Hamano --- diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index 6ff713b1f..d41470541 100755 --- a/t/t9801-git-p4-branch.sh +++ b/t/t9801-git-p4-branch.sh @@ -208,7 +208,7 @@ test_expect_success 'git-p4 clone simple branches' ' test -f file1 && test -f file2 && test ! -f file3 && - test_must_fail grep update file2 && + ! grep update file2 && git reset --hard p4/depot/branch3 && test -f file1 && test -f file2 && @@ -286,7 +286,7 @@ test_expect_success 'git-p4 clone complex branches' ' test_path_is_file file1 && test_path_is_file file2 && test_path_is_missing file3 && - test_must_fail grep update file2 && + ! grep update file2 && git reset --hard p4/depot/branch3 && test_path_is_file file1 && test_path_is_file file2 && @@ -296,12 +296,12 @@ test_expect_success 'git-p4 clone complex branches' ' test_path_is_file file1 && test_path_is_file file2 && test_path_is_missing file3 && - test_must_fail grep update file2 && + ! grep update file2 && git reset --hard p4/depot/branch5 && test_path_is_file file1 && test_path_is_file file2 && test_path_is_file file3 && - test_must_fail grep update file2 && + ! grep update file2 && test_path_is_missing .git/git-p4-tmp ) '