isoja testimuutoksia

tests/helpers/mock-api.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-MOCK_PORT=""
+MOCK_PORT=18080
 MOCK_PID=""
 MOCK_REQUEST_FILE=""
 MOCK_RESPONSE_CODE=201
@@ -9,20 +9,29 @@ MOCK_STATE_FILE="/tmp/mock_api_state"
 MOCK_SEQUENCE_FILE=""
 MOCK_CONFIG_FILE=""
 
-_free_port() {
-  python3 -c "import socket; s=socket.socket(); s.bind(('',0)); print(s.getsockname()[1]); s.close()"
+_kill_port() {
+  local pids
+  pids=$(lsof -ti ":$MOCK_PORT" 2>/dev/null) || true
+  if [ -n "$pids" ]; then
+    kill -9 $pids 2>/dev/null || true
+    sleep 0.5
+  fi
+}
+
+_wait_port_free() {
+  local i=0
+  while lsof -ti ":$MOCK_PORT" >/dev/null 2>&1 && [ $i -lt 50 ]; do
+    sleep 0.1
+    i=$((i + 1))
+  done
 }
 
 _wait_port_ready() {
   local i=0
-  while [ $i -lt 30 ]; do
-    if nc -z localhost "$MOCK_PORT" 2>/dev/null; then
-      return 0
-    fi
-    sleep 0.1
+  while ! lsof -ti ":$MOCK_PORT" >/dev/null 2>&1 && [ $i -lt 30 ]; do
+    sleep 0.2
     i=$((i + 1))
   done
-  return 1
 }
 
 mock_set_sequence() {
@@ -36,12 +45,6 @@ mock_clear_sequence() {
 }
 
 mock_start() {
-  MOCK_PORT=$(_free_port)
-  export MOCK_PORT
-  MOCK_URL="http://localhost:${MOCK_PORT}"
-  export SERVER_URL="$MOCK_URL"
-  export GITEA_API_URL="$MOCK_URL"
-
   MOCK_RESPONSE_CODE="${MOCK_RESPONSE_CODE:-201}"
   MOCK_REQUEST_FILE=$(mktemp)
   echo "$MOCK_REQUEST_FILE" > "$MOCK_STATE_FILE"
@@ -56,15 +59,19 @@ mock_start() {
     echo "$MOCK_RESPONSE_CODE" >> "$MOCK_CONFIG_FILE"
   fi
 
+  _kill_port
+  _wait_port_free
+
   nohup python3 "$(dirname "${BASH_SOURCE[0]}")/mock-server.py" "$MOCK_PORT" "$MOCK_CONFIG_FILE" "$MOCK_REQUEST_FILE" \
     </dev/null >/dev/null 2>&1 &
-  disown
   MOCK_PID=$!
   _wait_port_ready
 }
 
 mock_stop() {
   [ -n "${MOCK_PID:-}" ] && kill -9 "$MOCK_PID" 2>/dev/null || true
+  _kill_port
+  _wait_port_free
   [ -n "${MOCK_REQUEST_FILE:-}" ] && rm -f "${MOCK_REQUEST_FILE}" 2>/dev/null || true
   [ -n "${MOCK_SEQUENCE_FILE:-}" ] && rm -f "${MOCK_SEQUENCE_FILE}" 2>/dev/null || true
   [ -n "${MOCK_SEQUENCE_FILE:-}" ] && rm -f "${MOCK_SEQUENCE_FILE}.idx" 2>/dev/null || true

tests/helpers/mock-server.py

@@ -1,13 +1,6 @@
 #!/usr/bin/env python3
 import http.server, json, sys, os, threading
 
-# Daemonize: detach from parent process group
-if os.fork() > 0:
-    sys.exit(0)
-os.setsid()
-if os.fork() > 0:
-    sys.exit(0)
-
 PORT = int(sys.argv[1])
 CONFIG = sys.argv[2]
 REQ_FILE = sys.argv[3]