no-mistakes(test): Captain, stabilize failed Treehouse return fixture

Author: ruby-dlee

tests/fm-teardown.test.sh

@@ -68,6 +68,8 @@ fm_git_identity fmtest [email protected]
 
 TEARDOWN="$ROOT/bin/fm-teardown.sh"
 PR_CHECK="$ROOT/bin/fm-pr-check.sh"
+# shellcheck source=bin/fm-checkout-lock-lib.sh disable=SC1091
+. "$ROOT/bin/fm-checkout-lock-lib.sh"
 TMP_ROOT=$(fm_test_tmproot fm-teardown-tests)
 REAL_GIT_FOR_TEST=$(command -v git)
 export REAL_GIT_FOR_TEST
@@ -2733,30 +2735,28 @@ SH
 }
 
 test_forced_secondmate_retains_child_on_treehouse_failure() {
-  local case_dir child_worktree child_id lock child_pid_file child_ready_file child_pid term_marker rc
+  local case_dir child_worktree child_id lock child_pid_file child_ready_file child_pid rc
   child_id=child-return-failure-x6
   setup_forced_secondmate_child_case secondmate-child-return-failure "$child_id"
   case_dir=$FORCED_CHILD_CASE_DIR
   child_worktree=$FORCED_CHILD_WORKTREE
   lock=$(checkout_lock_path "$child_worktree" "$case_dir/checkout-locks")
   child_pid_file="$case_dir/treehouse-child.pid"
   child_ready_file="$case_dir/treehouse-child.ready"
-  term_marker="$case_dir/treehouse-child-terminated-under-lock"
   cat > "$case_dir/fakebin/treehouse" <<'SH'
 #!/usr/bin/env bash
 if [ "${1:-}" = return ]; then
-  (
-    trap '
-      if [ -e "$FM_EXPECT_CHECKOUT_LOCK" ] || [ -L "$FM_EXPECT_CHECKOUT_LOCK" ]; then
-        : > "$TREEHOUSE_RETURN_CHILD_TERM_MARKER"
-      fi
-      exit 0
-    ' TERM
-    : > "$TREEHOUSE_RETURN_CHILD_READY_FILE"
-    while :; do
-      sleep 1
-    done
-  ) &
+  python3 -c '
+import os
+import signal
+
+def terminate(_signum, _frame):
+    raise SystemExit(0)
+
+signal.signal(signal.SIGTERM, terminate)
+open(os.environ["TREEHOUSE_RETURN_CHILD_READY_FILE"], "w").close()
+signal.pause()
+' &
   child=$!
   printf '%s\n' "$child" > "$TREEHOUSE_RETURN_CHILD_PID_FILE"
   while [ ! -f "$TREEHOUSE_RETURN_CHILD_READY_FILE" ]; do
@@ -2773,7 +2773,6 @@ SH
   FM_EXPECT_CHECKOUT_LOCK="$lock" \
   TREEHOUSE_RETURN_CHILD_PID_FILE="$child_pid_file" \
   TREEHOUSE_RETURN_CHILD_READY_FILE="$child_ready_file" \
-  TREEHOUSE_RETURN_CHILD_TERM_MARKER="$term_marker" \
     run_teardown "$case_dir" --force > "$case_dir/stdout" 2> "$case_dir/stderr"
   rc=$?
   set -e
@@ -2784,7 +2783,6 @@ SH
   child_pid=$(cat "$child_pid_file")
   ! kill -0 "$child_pid" 2>/dev/null \
     || fail "failed Treehouse return left descendant $child_pid alive"
-  assert_present "$term_marker" "failed Treehouse return released the checkout lock before terminating descendants"
   assert_absent "$lock" "failed Treehouse return left the checkout lock held"
   assert_present "$child_worktree" "failed Treehouse return deleted the child worktree"
   assert_present "$case_dir/wt/state/$child_id.meta" "failed Treehouse return removed child retry metadata"