t: use test_might_fail for diff and grep

Some tests run diff or grep to produce an output, and then compare the output to an expected value. We know the exit code we expect these processes to have (e.g., grep yields 0 if it produced output and 1 otherwise), so it would not make the test wrong to look for it. But the difference between their output and the expected output (e.g., shown by test_cmp) is much more useful to somebody debugging the test than the test just bailing out. These tests break the &&-chain to skip the exit-code check of the process. However, we can get the same effect by using test_might_fail. Note that in some cases the test did use "|| return 1", which meant the test was not wrong, but it did fool --chain-lint. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 20, 2015 at 06:11 UTC 35da1bf5d6d51fe62d4d646c306c5cf5182a881e
2 files changed +6 -6
t/t1002-read-tree-m-u-2way.sh
+4 -4
@@ -75,8 +75,8 @@ test_expect_success \
75 echo yomin >yomin &&
76 git update-index --add yomin &&
77 read_tree_u_must_succeed -m -u $treeH $treeM &&
78 - git ls-files --stage >4.out || return 1
79 - git diff -U0 --no-index M.out 4.out >4diff.out
78 + git ls-files --stage >4.out &&
79 + test_might_fail git diff -U0 --no-index M.out 4.out >4diff.out &&
80 compare_change 4diff.out expected &&
81 check_cache_at yomin clean &&
82 sum bozbar frotz nitfol >actual4.sum &&
@@ -94,8 +94,8 @@ test_expect_success \
94 git update-index --add yomin &&
95 echo yomin yomin >yomin &&
96 read_tree_u_must_succeed -m -u $treeH $treeM &&
97 - git ls-files --stage >5.out || return 1
98 - git diff -U0 --no-index M.out 5.out >5diff.out
97 + git ls-files --stage >5.out &&
98 + test_might_fail git diff -U0 --no-index M.out 5.out >5diff.out &&
99 compare_change 5diff.out expected &&
100 check_cache_at yomin dirty &&
101 sum bozbar frotz nitfol >actual5.sum &&
t/t5550-http-fetch-dumb.sh
+2 -2
@@ -184,8 +184,8 @@ test_expect_success 'fetch can handle previously-fetched .idx files' '
184 '
185
186 test_expect_success 'did not use upload-pack service' '
187 - grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act
188 - : >exp
187 + test_might_fail grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act &&
188 + : >exp &&
189 test_cmp exp act
190 '
191