Merge pull request #515 from TypedDevs/fix/512-edge-case-errors-in-tear-down-and-set_up

Edge case errors in tear down and set Up

Author: Chemaclass

CHANGELOG.md

@@ -8,7 +8,10 @@
 
 ### Fixed
 - Pass arguments to mocked functions
-- Fix lifecycle hooks not catching failing commands (exit code errors)
+- Fix lifecycle hooks not catching intermediate failing commands in `set_up` and `tear_down`
+
+### Changed
+- Simplify CI: use only `-latest` runners for Ubuntu and macOS, remove deprecated `macos-13`
 
 ## [0.26.0](https://github.com/TypedDevs/bashunit/compare/0.25.0...0.26.0) - 2025-11-02
 

src/runner.sh

@@ -346,7 +346,14 @@ function runner::run_test() {
     # shellcheck disable=SC2064
     trap 'exit_code=$?; runner::cleanup_on_exit "$test_file" "$exit_code"' EXIT
     state::initialize_assertions_count
-    runner::run_set_up "$test_file" || exit $?
+
+    # Run set_up and capture exit code without || to preserve errexit behavior
+    local setup_exit_code=0
+    runner::run_set_up "$test_file"
+    setup_exit_code=$?
+    if [[ $setup_exit_code -ne 0 ]]; then
+      exit $setup_exit_code
+    fi
 
     # 2>&1: Redirects the std-error (FD 2) to the std-output (FD 1).
     # points to the original std-output.
@@ -740,9 +747,22 @@ function runner::execute_test_hook() {
   local hook_output_file
   hook_output_file=$(temp_file "${hook_name}_output")
 
+  # Enable errexit and errtrace to catch any failing command in the hook
+  set -eE
+  # Set up trap to catch errors and record the exit status
+  trap 'status=$?; set +eE; trap - ERR' ERR
+
   {
     "$hook_name"
-  } >"$hook_output_file" 2>&1 || status=$?
+  } >"$hook_output_file" 2>&1
+
+  # Capture final status and clean up
+  local block_exit=$?
+  if [[ $status -eq 0 ]]; then
+    status=$block_exit
+  fi
+  trap - ERR
+  set +eE
 
   if [[ -f "$hook_output_file" ]]; then
     hook_output=""

tests/acceptance/bashunit_setup_error_test.sh

@@ -60,3 +60,29 @@ function test_bashunit_when_set_up_with_failing_command() {
   assert_contains "$assertions_summary" "$actual"
   assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
 }
+
+function test_bashunit_when_set_up_with_intermediate_failing_command() {
+  local test_file=./tests/acceptance/fixtures/test_bashunit_when_setup_with_intermediate_failing_command.sh
+  local fixture=$test_file
+
+  local header_line="Running $fixture"
+  local error_line="✗ Error: Set up"
+  local message_line="    Hook 'set_up' failed with exit code 1"
+  local tests_summary="Tests:      1 failed, 1 total"
+  local assertions_summary="Assertions: 0 failed, 0 total"
+
+  local actual_raw
+  set +e
+  actual_raw="$(./bashunit --no-parallel --detailed --env "$TEST_ENV_FILE" "$test_file")"
+  set -e
+
+  local actual
+  actual="$(printf "%s" "$actual_raw" | strip_ansi)"
+
+  assert_contains "$header_line" "$actual"
+  assert_contains "$error_line" "$actual"
+  assert_contains "$message_line" "$actual"
+  assert_contains "$tests_summary" "$actual"
+  assert_contains "$assertions_summary" "$actual"
+  assert_general_error "$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$test_file")"
+}

tests/acceptance/fixtures/test_bashunit_when_setup_with_intermediate_failing_command.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+function set_up() {
+  false
+  true
+}
+
+function test_dummy() {
+  assert_same "foo" "foo"
+}