Merge branch 'main' into codex/add-assert_match_snapshot_ignore_colors

Author: Chemaclass

src/runner.sh

@@ -136,6 +136,13 @@ function runner::run_test() {
   local fn_name="$1"
   shift
 
+  # Export a unique test identifier so that test doubles can
+  # create temporary files scoped per test run. This prevents
+  # race conditions when running tests in parallel.
+  local sanitized_fn_name
+  sanitized_fn_name="$(helper::normalize_variable_name "$fn_name")"
+  export BASHUNIT_CURRENT_TEST_ID="${sanitized_fn_name}_$$"
+
   local interpolated_fn_name="$(helper::interpolate_function_name "$fn_name" "$@")"
   local current_assertions_failed="$(state::get_assertions_failed)"
   local current_assertions_snapshot="$(state::get_assertions_snapshot)"

src/test_doubles.sh

@@ -48,8 +48,9 @@ function spy() {
   export "${variable}_params"
 
   local times_file params_file
-  times_file=$(temp_file "${variable}_times")
-  params_file=$(temp_file "${variable}_params")
+  local test_id="${BASHUNIT_CURRENT_TEST_ID:-global}"
+  times_file=$(temp_file "${test_id}_${variable}_times")
+  params_file=$(temp_file "${test_id}_${variable}_params")
   echo 0 > "$times_file"
   : > "$params_file"
   export "${variable}_times_file"="$times_file"

tests/acceptance/fixtures/test_parallel_spy_file1.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+function test_spy_file1() {
+  spy date
+  date
+  assert_have_been_called_times 1 date
+}

tests/acceptance/fixtures/test_parallel_spy_file2.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+function test_spy_file2() {
+  spy date
+  date
+  assert_have_been_called_times 1 date
+}

tests/acceptance/parallel_spy_parallel_test.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+function test_spies_work_in_parallel() {
+  local file1=tests/acceptance/fixtures/test_parallel_spy_file1.sh
+  local file2=tests/acceptance/fixtures/test_parallel_spy_file2.sh
+
+  ./bashunit --parallel "$file1" "$file2"
+  assert_successful_code
+}

tests/functional/doubles_test.sh

@@ -12,17 +12,3 @@ function test_mock_ps_when_executing_a_sourced_function() {
 
   assert_match_snapshot "$(top_mem)"
 }
-
-function test_spy_commands_called_once_when_executing_a_sourced_function() {
-
-  source ./tests/functional/fixtures/doubles_function.sh
-  spy ps
-  spy awk
-  spy head
-
-  top_mem
-
-  assert_have_been_called_times 1 ps
-  assert_have_been_called_times 1 awk
-  assert_have_been_called_times 1 head
-}

tests/functional/fixtures/doubles_function.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 function top_mem() {
-  ps -eo cmd,%mem --sort=-%mem | awk '$2 >= 1.0 {print $0}' | head -n 3
+  ps | awk '$2 >= 1.0 {print $0}' | head -n 3
 }