Merge pull request #657 from marc-hb/fix-infinite-j

martin-schulze-vireso · web-flow · commit e3bd116fa832 · 2022-10-06T00:29:52.000+02:00
Fix infinite wait when invoking "bats -j5" instead of "bats -j 5"
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog][kac] and this project adheres to
 
 * `shfmt` all files and enforce via CI (#651)
 * avoid kernel warning flood/hang with CTRL+C on Bash 5.2 RC (#656)
+* Fix infinite wait with (invalid) `-j<n>` (without space) (#657)
 
 ## [1.8.0] - 2022-09-15
 
diff --git a/libexec/bats-core/bats-exec-file b/libexec/bats-core/bats-exec-file
@@ -285,6 +285,11 @@ bats_read_tests_list_file() {
 bats_run_tests() {
   bats_exec_file_status=0
 
+  if [[ "$num_jobs" -lt 1 ]]; then
+    printf 'Invalid number of jobs: %s\n' "$num_jobs" >&2
+    exit 1
+  fi
+
   if [[ "$num_jobs" != 1 && "${BATS_NO_PARALLELIZE_WITHIN_FILE-False}" == False ]]; then
     export BATS_SEMAPHORE_NUMBER_OF_SLOTS="$num_jobs"
     bats_run_tests_in_parallel "$BATS_RUN_TMPDIR/parallel_output" || bats_exec_file_status=1
diff --git a/test/parallel.bats b/test/parallel.bats
@@ -5,6 +5,9 @@ bats_require_minimum_version 1.5.0
 load test_helper
 fixtures parallel
 
+# shellcheck disable=SC2034
+BATS_TEST_TIMEOUT=10 # only intended for the "short form ..."" test
+
 setup() {
   type -p parallel &>/dev/null || skip "--jobs requires GNU parallel"
   (type -p flock &>/dev/null || type -p shlock &>/dev/null) || skip "--jobs requires flock/shlock"
@@ -208,3 +211,10 @@ check_parallel_tests() { # <expected maximum parallelity>
 @test "BATS_NO_PARALLELIZE_WITHIN_FILE does not work from inside test function" {
   DISABLE_IN_TEST_FUNCTION=1 reentrant_run ! bats --jobs 2 "$FIXTURE_ROOT/must_not_parallelize_within_file.bats"
 }
+
+@test "Short form typo does not run endlessly" {
+  unset BATS_NO_PARALLELIZE_ACROSS_FILES
+  run bats -j2 "$FIXTURE_ROOT/../bats/passing.bats"
+  (( SECONDS < 5 ))
+  [ "${lines[1]}" = 'Invalid number of jobs: -2' ]
+}
diff --git a/test/timeout.bats b/test/timeout.bats
@@ -23,3 +23,7 @@ bats_require_minimum_version 1.5.0
   [ "${lines[3]}" == "#   \`sleep \"\${SLEEP?}\"' failed due to timeout" ]
   ((SECONDS < 10)) || false
 }
+
+@test "sleep in run" {
+    run sleep 10
+}

Original file line number	Diff line number	Diff line change
`@@ -23,3 +23,7 @@ bats_require_minimum_version 1.5.0`
`23`	`23`	[ "${lines[3]}" == "# \`sleep \"\${SLEEP?}\"' failed due to timeout" ]
`24`	`24`	`((SECONDS < 10)) \|\| false`
`25`	`25`	`}`
	`26`	`+`
	`27`	`+@test "sleep in run" {`
	`28`	`+ run sleep 10`
	`29`	`+}`