Merge pull request #419 from TypedDevs/fix/parallel-mode

Fix parallel mode

Author: Chemaclass

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Fix typo "to has been called"
 - Add weekly downloads to the docs
+- Fix parallel runner
 
 ## [0.20.0](https://github.com/TypedDevs/bashunit/compare/0.19.1...0.20.0) - 2025-06-01
 

src/env.sh

@@ -120,7 +120,9 @@ function env::print_verbose() {
 }
 
 EXIT_CODE_STOP_ON_FAILURE=4
-TEMP_DIR_PARALLEL_TEST_SUITE="/tmp/bashunit/parallel/${_OS:-Unknown}"
+# Use a unique directory per run to avoid conflicts when bashunit is invoked
+# recursively or multiple instances are executed in parallel.
+TEMP_DIR_PARALLEL_TEST_SUITE="/tmp/bashunit/parallel/${_OS:-Unknown}/$(random_str 8)"
 TEMP_FILE_PARALLEL_STOP_ON_FAILURE="$TEMP_DIR_PARALLEL_TEST_SUITE/.stop-on-failure"
 TERMINAL_WIDTH="$(env::find_terminal_width)"
 FAILURES_OUTPUT_PATH=$(mktemp)

src/parallel.sh

@@ -34,6 +34,9 @@ function parallel::aggregate_test_results() {
       local snapshot="${result_line##*##ASSERTIONS_SNAPSHOT=}"
       snapshot="${snapshot%%##*}"; snapshot=${snapshot:-0}
 
+      local exit_code="${result_line##*##TEST_EXIT_CODE=}"
+      exit_code="${exit_code%%##*}"; exit_code=${exit_code:-0}
+
       # Add to the total counts
       total_failed=$((total_failed + failed))
       total_passed=$((total_passed + passed))
@@ -46,6 +49,11 @@ function parallel::aggregate_test_results() {
         continue
       fi
 
+      if [ "${exit_code:-0}" -ne 0 ]; then
+        state::add_tests_failed
+        continue
+      fi
+
       if [ "${snapshot:-0}" -gt 0 ]; then
         state::add_tests_snapshot
         continue
@@ -83,6 +91,7 @@ function parallel::must_stop_on_failure() {
 function parallel::reset() {
   # shellcheck disable=SC2153
   rm -rf "$TEMP_DIR_PARALLEL_TEST_SUITE"
+  mkdir -p "$TEMP_DIR_PARALLEL_TEST_SUITE"
   [ -f "$TEMP_FILE_PARALLEL_STOP_ON_FAILURE" ] && rm "$TEMP_FILE_PARALLEL_STOP_ON_FAILURE"
 }
 

tests/acceptance/bashunit_parallel_consistency_test.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+function set_up_before_script() {
+  TEST_ENV_FILE="tests/acceptance/fixtures/.env.default"
+}
+
+function test_parallel_and_sequential_results_match() {
+  local file1=tests/acceptance/fixtures/test_bashunit_when_a_test_passes.sh
+  local file2=tests/acceptance/fixtures/test_bashunit_when_a_test_fail.sh
+  local file3=tests/acceptance/fixtures/test_bashunit_when_a_execution_error.sh
+
+  local sequential_output
+  sequential_output=$(./bashunit --no-parallel --env "$TEST_ENV_FILE" "$file1" "$file2" "$file3")
+
+  local parallel_output
+  parallel_output=$(./bashunit --parallel --env "$TEST_ENV_FILE" "$file1" "$file2" "$file3")
+
+  local sequential_summary
+  sequential_summary=$(echo "$sequential_output" | grep -e "Tests:" -e "Assertions:" | tr '\n' ' ')
+
+  local parallel_summary
+  parallel_summary=$(echo "$parallel_output" | grep -e "Tests:" -e "Assertions:" | tr '\n' ' ')
+
+  assert_equals "$sequential_summary" "$parallel_summary"
+}