test: add fuzzy-match edge case and validate state file assertions (merge worktree-20260324-211622)

Author: JoeOakhartNava

plugins/dso/scripts/project-detect.sh

@@ -126,7 +126,7 @@ _discover_suites() {
         for subdir in "$project_dir/$test_root"/*/; do
             [[ -d "$subdir" ]] || continue
             local has_test_files
-            has_test_files="$(find "$subdir" -maxdepth 1 -name 'test_*.py' -print -quit 2>/dev/null)"
+            has_test_files="$(find "$subdir" -maxdepth 1 -name 'test_*.py' 2>/dev/null | head -1)"
             if [[ -n "$has_test_files" ]]; then
                 local dirname
                 dirname="$(basename "$subdir")"

plugins/dso/scripts/validate.sh

@@ -501,8 +501,7 @@ _test_state_already_passed() {
     # Compute the expected command hash so we can verify the state file
     # belongs to this command (not a different test command).
     local expected_hash
-    expected_hash=$(echo -n "${test_cmd}:$(pwd)" | sha256sum 2>/dev/null | awk '{print $1}' || \
-        echo -n "${test_cmd}:$(pwd)" | python3 -c "import sys,hashlib; print(hashlib.sha256(sys.stdin.buffer.read()).hexdigest())")
+    expected_hash=$(python3 -c "import hashlib,sys; print(hashlib.sha256(sys.argv[1].encode()).hexdigest())" "${test_cmd}:$(pwd)")
     python3 - "$expected_hash" "$state_file" <<PYEOF 2>/dev/null
 import json, sys
 expected_hash = sys.argv[1]

tests/hooks/test-fuzzy-match.sh

@@ -228,18 +228,19 @@ test_benchmark_20_files() {
     git -C "$repo" add -A && git -C "$repo" commit -m "add 20 pairs" --quiet 2>/dev/null
 
     local start_time end_time elapsed
-    start_time=$(date +%s)
+    start_time=$(python3 -c "import time; print(time.time())")
     for i in $(seq 1 20); do
         fuzzy_find_associated_tests "$repo/src/module_${i}.py" "$repo" >/dev/null 2>&1
     done
-    end_time=$(date +%s)
-    elapsed=$(( end_time - start_time ))
+    end_time=$(python3 -c "import time; print(time.time())")
+    elapsed=$(python3 -c "print(int(($end_time - $start_time) * 1000))")
 
-    if (( elapsed < 10 )); then
+    # elapsed is now in milliseconds; 10s = 10000ms
+    if (( elapsed < 10000 )); then
         (( ++PASS ))
     else
         (( ++FAIL ))
-        echo "FAIL: benchmark_20_files — took ${elapsed}s (limit: 10s)" >&2
+        echo "FAIL: benchmark_20_files — took ${elapsed}ms (limit: 10000ms)" >&2
     fi
 }
 
@@ -287,6 +288,27 @@ test_red_phase_counter_additive() {
     fi
 }
 
+# ── Test 12: source-file-is-test-file edge case ──────────────────────────────
+# Bug dso-ovj9: when the source file IS a test file (e.g., tests/test_foo.py),
+# fuzzy_find_associated_tests should return itself (it's its own test).
+test_source_file_is_test_file() {
+    if (( ! _FUZZY_MATCH_LOADED )); then
+        (( ++FAIL ))
+        echo "FAIL: test_source_file_is_test_file — fuzzy-match.sh not loaded" >&2
+        return
+    fi
+    local repo
+    repo=$(create_test_repo)
+    mkdir -p "$repo/tests"
+    echo "pass" > "$repo/tests/test_foo.py"
+    git -C "$repo" add -A && git -C "$repo" commit -m "add test" --quiet 2>/dev/null
+
+    local result
+    result=$(fuzzy_find_associated_tests "$repo/tests/test_foo.py" "$repo")
+    # A test file queried as source should return itself (it's its own associated test)
+    assert_ne "source-is-test: result should be non-empty" "" "$result"
+}
+
 # ── Run all tests ────────────────────────────────────────────────────────────
 test_bash_convention_matches
 test_python_convention_matches
@@ -299,6 +321,7 @@ test_custom_test_dirs
 test_benchmark_20_files
 test_dogfood_bump_version
 test_red_phase_counter_additive
+test_source_file_is_test_file
 
 # ── Summary ──────────────────────────────────────────────────────────────────
 # In RED phase (library missing), all tests correctly FAIL. Print summary with

tests/hooks/test-review-complexity-classifier.sh

@@ -659,15 +659,7 @@ test_classifier_is_merge_commit_size_action_none() {
     setup_temp_dir
     local diff_file
     diff_file=$(create_n_line_diff 600 "src/foo.py")
-    export MOCK_MERGE_HEAD=1
-    CLASSIFIER_OUTPUT=""
-    CLASSIFIER_EXIT=0
-    if [[ -x "$CLASSIFIER" ]]; then
-        CLASSIFIER_OUTPUT=$(MOCK_MERGE_HEAD=1 bash "$CLASSIFIER" < "$diff_file" 2>/dev/null) || CLASSIFIER_EXIT=$?
-    else
-        CLASSIFIER_EXIT=127
-    fi
-    unset MOCK_MERGE_HEAD
+    MOCK_MERGE_HEAD=1 run_classifier "$diff_file"
 
     local size_action=""
     if [[ "$CLASSIFIER_EXIT" -eq 0 ]] && is_valid_json "$CLASSIFIER_OUTPUT"; then

tests/scripts/test-validate-test-batched-integration.sh

@@ -146,6 +146,19 @@ output=$(
 # validate.sh must exit 2 when tests are pending
 assert_eq "test_validate_exits_2_on_partial_tests exits 2 (pending)" "2" "$rc"
 
+# Bug dso-w7bs: verify the state file was written with expected partial content
+if [[ -f "$_partial_state_file" ]]; then
+    _state_has_interrupted=$(python3 -c "
+import json,sys
+d=json.load(open(sys.argv[1]))
+print('yes' if d.get('signal_interrupted') else 'no')
+" "$_partial_state_file" 2>/dev/null || echo "error")
+    assert_eq "test_validate_exits_2_on_partial_tests state file has signal_interrupted" "yes" "$_state_has_interrupted"
+else
+    (( ++FAIL ))
+    echo "FAIL: test_validate_exits_2_on_partial_tests — state file not created at $_partial_state_file" >&2
+fi
+
 assert_pass_if_clean "test_validate_exits_2_on_partial_tests"
 
 # ============================================================================