t: wrap complicated expect_code users in a block

If we are expecting a command to produce a particular exit
code, we can use test_expect_code. However, some cases are
more complicated, and want to accept one of a range of exit
codes. For these, we end up with something like:

cmd;
case "$?" in
...

That unfortunately breaks the &&-chain and fools
--chain-lint. Since these special cases are so few, we can
wrap them in a block, like this:

{ cmd; ret=$?; } &&
case "$ret" in
...

This accomplishes the same thing, and retains the &&-chain
(the exit status fed to the && is that of the assignment,
which should always be true). It's technically longer, but
it is probably a good thing for unusual code like this to
stand out.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0005-signals.sh b/t/t0005-signals.sh
index aeea50c6339ebd4a0d33ce03b7fad5948e69a8a8..5c5707d7158bd5156ba02c8955b0c0cc11eaa0ba 100755 (executable)
--- a/t/t0005-signals.sh
+++ b/t/t0005-signals.sh
@@ -10,8 +10,8 @@ one
 EOF
 
 test_expect_success 'sigchain works' '
 EOF
 
 test_expect_success 'sigchain works' '

-       test-sigchain >actual
-       case "$?" in
+       { test-sigchain >actual; ret=$?; } &&
+       case "$ret" in

        143) true ;; # POSIX w/ SIGTERM=15
        271) true ;; # ksh w/ SIGTERM=15
          3) true ;; # Windows
        143) true ;; # POSIX w/ SIGTERM=15
        271) true ;; # ksh w/ SIGTERM=15
          3) true ;; # Windows

diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index 4d20feacfe8b7688c9bfefc43d60ba4f1a6c2cfc..2b32c4fbe67d9dc0a43fc7858ddd3ac400b6171f 100755 (executable)
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -111,9 +111,9 @@ test_expect_success 'unknown color slots are ignored (branch)' '
 '
 
 test_expect_success 'unknown color slots are ignored (status)' '
 '
 
 test_expect_success 'unknown color slots are ignored (status)' '

-       git config color.status.nosuchslotwilleverbedefined white || exit
-       git status
-       case $? in 0|1) : ok ;; *) false ;; esac
+       git config color.status.nosuchslotwilleverbedefined white &&
+       { git status; ret=$?; } &&
+       case $ret in 0|1) : ok ;; *) false ;; esac

 '
 
 test_done
 '
 
 test_done

diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index 305bcac6b765111106887d4d24d99657c0554b5b..654addaae3e7040bcb4ce1014ee327511f73c8e5 100755 (executable)
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@ -66,8 +66,10 @@ test_expect_success UNZIP 'zip archive of empty tree is empty' '
        # handle the empty repo at all, making our later check of its exit code
        # a no-op). But we cannot do anything reasonable except skip the test
        # on such platforms anyway, and this is the moral equivalent.
        # handle the empty repo at all, making our later check of its exit code
        # a no-op). But we cannot do anything reasonable except skip the test
        # on such platforms anyway, and this is the moral equivalent.

-       "$GIT_UNZIP" "$TEST_DIRECTORY"/t5004/empty.zip
-       expect_code=$?
+       {
+               "$GIT_UNZIP" "$TEST_DIRECTORY"/t5004/empty.zip
+               expect_code=$?
+       } &&

 
        git archive --format=zip HEAD >empty.zip &&
        make_dir extract &&
 
        git archive --format=zip HEAD >empty.zip &&
        make_dir extract &&

diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index 321c3e5234fdec35f5925e40a18ae74d1cba55c0..3bd9759e0ff01af9969e1f8ae088945d9e2e34e4 100755 (executable)
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -103,8 +103,10 @@ test_expect_success 'confuses pattern as remote when no remote specified' '
 '
 
 test_expect_success 'die with non-2 for wrong repository even with --exit-code' '
 '
 
 test_expect_success 'die with non-2 for wrong repository even with --exit-code' '

-       git ls-remote --exit-code ./no-such-repository ;# not &&
-       status=$? &&
+       {
+               git ls-remote --exit-code ./no-such-repository
+               status=$?
+       } &&

        test $status != 2 && test $status != 0
 '
 
        test $status != 2 && test $status != 0
 '