ci: harden the webhttrack smoke test and drop its leaky watchdog

Follow-up to #540. A narrow-charter review found two issues in the smoke test
as merged:

- The content check matched only the HTTrack brand string, which is a literal
  in every page header, so a truncated or degraded template served 200 would
  still pass. Also require the step-2 form action, which such a page lacks.
- The hard watchdog subshell was un-redirected, so its orphaned sleep kept the
  CI step stdout open ~35s after every run. The poll loop and teardown already
  bound the run, so drop the watchdog and SIGKILL webhttrack if it ignores TERM.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Xavier Roche <roche@httrack.com>

src/webhttrack

@@ -12,9 +12,10 @@ if test -n "${BROWSER}"; then
 fi
 # Patch for Darwin/Mac by Ross Williams
 if test "$(uname -s)" == "Darwin"; then
-    # Darwin's 'open -W' launches the default browser and waits for it to quit.
-    # Keep it only as a fallback so a configured $BROWSER still wins the search.
-    BROWSEREXEFALLBACK="/usr/bin/open -W"
+    # Darwin/Mac OS X uses a system 'open' command to find
+    # the default browser. The -W flag causes it to wait for
+    # the browser to exit
+    BROWSEREXE="/usr/bin/open -W"
 fi
 BINWD=$(dirname "$0")
 SRCHPATH=("$BINWD" /usr/local/bin /usr/share/bin /usr/bin /usr/lib/httrack /usr/local/lib/httrack /usr/local/share/httrack /opt/local/bin /sw/bin "${HOME}/usr/bin" "${HOME}/bin")
@@ -80,7 +81,6 @@ for i in "${SRCHBROWSEREXE[@]}"; do
     done
     test -n "$BROWSEREXE" && break
 done
-test -n "$BROWSEREXE" || BROWSEREXE="${BROWSEREXEFALLBACK}"
 test -n "$BROWSEREXE" || ! log "Could not find any suitable browser" || exit 1
 
 # "browse" command

tests/webhttrack-smoke.sh

@@ -35,14 +35,16 @@ EOF
 chmod +x "$stubdir/uname"
 
 # Stub browser: webhttrack tries its browser-name list in order and runs the
-# first it finds, so shadow the first entry, "x-www-browser". It gets the server
-# URL, fetches it, and records the result (htsserver only lives until webhttrack
-# exits, so the check has to happen here).
+# first it finds, so shadow the first entry, "x-www-browser". It fetches the
+# server URL and records PASS only for the working UI: the brand string AND the
+# step-2 form action, which a truncated/degraded template page would lack (the
+# bare title alone is not enough). htsserver only lives until webhttrack exits,
+# so the check has to happen here.
 # -a: the UI is served ISO-8859-1, so grep must not treat it as binary.
 cat >"$stubdir/x-www-browser" <<EOF
 #!/bin/bash
 echo "stub browser invoked with: \$1" >&2
-if body="\$(curl -fsSL --max-time 20 "\$1")" && printf '%s' "\$body" | grep -qai httrack; then
+if body="\$(curl -fsSL --max-time 20 "\$1")" && printf '%s' "\$body" | grep -qai httrack && printf '%s' "\$body" | grep -qaF step2.html; then
     echo PASS >"$marker"
 else
     echo "FAIL: unexpected response from \$1" >"$marker"
@@ -55,15 +57,8 @@ echo "launching webhttrack"
 "$wht" </dev/null >"$work/webhttrack.log" 2>&1 &
 whpid=$!
 
-# Hard watchdog: macOS has no timeout(1), and webhttrack can block if htsserver
-# never publishes a URL, so guarantee the tree dies regardless of the poll below.
-(
-    sleep 40
-    kill "$whpid" 2>/dev/null || true
-    pkill -f "$prefix/bin/htsserver" 2>/dev/null || true
-) &
-wdpid=$!
-
+# Bounded poll for the marker (macOS has no timeout(1)); teardown below kills
+# webhttrack and reaps htsserver, so the run is bounded without a watchdog.
 for i in $(seq 1 45); do
     test -f "$marker" && {
         echo "marker written after ${i}s"
@@ -76,8 +71,8 @@ for i in $(seq 1 45); do
     sleep 1
 done
 
-# Reap webhttrack and the htsserver it spawned; stop the watchdog. Confirm death
-# with a bounded poll instead of a blocking wait (which could hang on macOS).
+# Reap webhttrack and the htsserver it spawned. Confirm death with a bounded poll
+# (not a blocking wait, which could hang on macOS); SIGKILL if it ignores TERM.
 echo "tearing down"
 kill "$whpid" 2>/dev/null || true
 if pkill -f "$prefix/bin/htsserver" 2>/dev/null; then
@@ -85,11 +80,11 @@ if pkill -f "$prefix/bin/htsserver" 2>/dev/null; then
 else
     echo "no lingering htsserver"
 fi
-kill "$wdpid" 2>/dev/null || true
 for _ in $(seq 1 10); do
     kill -0 "$whpid" 2>/dev/null || break
     sleep 1
 done
+kill -9 "$whpid" 2>/dev/null || true
 
 echo "--- webhttrack.log ---"
 cat "$work/webhttrack.log" 2>/dev/null || true