t0003: don't use `test_must_fail attr_check`

In an effort to remove test_must_fail for all invocations not related to
git or test-tool, replace invocations of `test_must_fail attr_check`
with a plain attr_check call with the $expect argument set to the
actual value output by git.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index c30c736d3f0100a8bd8921211a9006f703a1f53e..b660593c20f8d4012e8c81e2276004708c2a1259 100755 (executable)
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -24,7 +24,7 @@ attr_check_quote () {
 
 test_expect_success 'open-quoted pathname' '
        echo "\"a test=a" >.gitattributes &&
-       test_must_fail attr_check a a
+       attr_check a unspecified
 '
 
 
@@ -109,20 +109,20 @@ test_expect_success 'attribute test' '
 
 test_expect_success 'attribute matching is case sensitive when core.ignorecase=0' '
 
-       test_must_fail attr_check F f "-c core.ignorecase=0" &&
-       test_must_fail attr_check a/F f "-c core.ignorecase=0" &&
-       test_must_fail attr_check a/c/F f "-c core.ignorecase=0" &&
-       test_must_fail attr_check a/G a/g "-c core.ignorecase=0" &&
-       test_must_fail attr_check a/B/g a/b/g "-c core.ignorecase=0" &&
-       test_must_fail attr_check a/b/G a/b/g "-c core.ignorecase=0" &&
-       test_must_fail attr_check a/b/H a/b/h "-c core.ignorecase=0" &&
-       test_must_fail attr_check a/b/D/g "a/b/d/*" "-c core.ignorecase=0" &&
-       test_must_fail attr_check oNoFf unset "-c core.ignorecase=0" &&
-       test_must_fail attr_check oFfOn set "-c core.ignorecase=0" &&
+       attr_check F unspecified "-c core.ignorecase=0" &&
+       attr_check a/F unspecified "-c core.ignorecase=0" &&
+       attr_check a/c/F unspecified "-c core.ignorecase=0" &&
+       attr_check a/G unspecified "-c core.ignorecase=0" &&
+       attr_check a/B/g a/g "-c core.ignorecase=0" &&
+       attr_check a/b/G unspecified "-c core.ignorecase=0" &&
+       attr_check a/b/H unspecified "-c core.ignorecase=0" &&
+       attr_check a/b/D/g a/g "-c core.ignorecase=0" &&
+       attr_check oNoFf unspecified "-c core.ignorecase=0" &&
+       attr_check oFfOn unspecified "-c core.ignorecase=0" &&
        attr_check NO unspecified "-c core.ignorecase=0" &&
-       test_must_fail attr_check a/b/D/NO "a/b/d/*" "-c core.ignorecase=0" &&
+       attr_check a/b/D/NO unspecified "-c core.ignorecase=0" &&
        attr_check a/b/d/YES a/b/d/* "-c core.ignorecase=0" &&
-       test_must_fail attr_check a/E/f "A/e/F" "-c core.ignorecase=0"
+       attr_check a/E/f f "-c core.ignorecase=0"
 
 '
 
@@ -146,8 +146,8 @@ test_expect_success 'attribute matching is case insensitive when core.ignorecase
 '
 
 test_expect_success CASE_INSENSITIVE_FS 'additional case insensitivity tests' '
-       test_must_fail attr_check a/B/D/g "a/b/d/*" "-c core.ignorecase=0" &&
-       test_must_fail attr_check A/B/D/NO "a/b/d/*" "-c core.ignorecase=0" &&
+       attr_check a/B/D/g a/g "-c core.ignorecase=0" &&
+       attr_check A/B/D/NO unspecified "-c core.ignorecase=0" &&
        attr_check A/b/h a/b/h "-c core.ignorecase=1" &&
        attr_check a/B/D/g "a/b/d/*" "-c core.ignorecase=1" &&
        attr_check A/B/D/NO "a/b/d/*" "-c core.ignorecase=1"