[PATCH 02/12] t: prepare `test_must_fail ()` for `set -e`
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Apr 13, 2026, 09:49 UTC
- Message-ID
- <20260413-b4-pks-tests-with-set-e-v1-2-5b83763a0e84@pks.im>
- In-Reply-To
- <20260413-b4-pks-tests-with-set-e-v1-0-5b83763a0e84@pks.im>
The helper function `test_must_fail ()` executes a specific Git command that may or may not fail in a specific way. This is done by executing the command in question and then comparing its exit code against a set of conditions.
This works, but once we run our test suite with `set -e` we may bail out of `test_must_fail ()` early in case the command actually fails, even though we expect it to fail. Prepare for this change by marking the command part of a condition.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- t/test-lib-functions.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index f3af10fb7e..f8bc77619b 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -1195,8 +1195,12 @@ test_must_fail () { echo >&7 "test_must_fail: only 'git' is allowed: $*" return 1 fi - "$@" 2>&7 - exit_code=$? + if "$@" 2>&7 + then + exit_code=0 + else + exit_code=$? + fi if test $exit_code -eq 0 && ! list_contains "$_test_ok" success then echo >&4 "test_must_fail: command succeeded: $*"
-- 2.54.0.rc0.707.g0fbf48f4d6.dirty