Fix e2e: wait for CONFIG_WIZARD before capturing OctoPrint artifacts

The test and screenshot hook both matched "OctoPrint" in the
starting page title instead of waiting for the actual wizard.
Now both poll specifically for CONFIG_WIZARD in the response.
The test saves HTML from the matching response (not a second curl).
Add chromium to the Docker container for headless screenshots.
Increase poll timeout to 600s for slower CI runners.

Author: guysoft

testing/Dockerfile

@@ -3,7 +3,7 @@ FROM ptrsr/pi-ci:latest
 ENV LIBGUESTFS_BACKEND=direct
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    sshpass openssh-client curl socat imagemagick \
+    sshpass openssh-client curl socat imagemagick chromium \
     && rm -rf /var/lib/apt/lists/*
 
 # Shared framework from CustomPiOS (copied into build context by CI)

testing/hooks/screenshot.sh

@@ -6,23 +6,35 @@ ARTIFACTS_DIR="${3:-/output}"
 
 SSH_CMD="sshpass -p raspberry ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o PreferredAuthentications=password -o PubkeyAuthentication=no -o LogLevel=ERROR -p $SSH_PORT ${SSH_HOST}"
 
-echo "Capturing OctoPrint web UI artifacts..."
+echo "Waiting for OctoPrint wizard page before capturing..."
 
-# Save rendered HTML via curl through SSH (inside the guest, hitting localhost:80)
-BODY=$(${SSH_CMD} -l pi "curl -s http://localhost" 2>/dev/null || echo "")
+WIZARD_READY=0
+for i in $(seq 1 24); do
+    BODY=$(${SSH_CMD} -l pi "curl -s http://localhost" 2>/dev/null || echo "")
+    if echo "$BODY" | grep -q "CONFIG_WIZARD"; then
+        WIZARD_READY=1
+        echo "$BODY" > "$ARTIFACTS_DIR/octoprint-ui.html"
+        echo "  Saved OctoPrint wizard HTML to artifacts (after ${i}x5s)"
+        break
+    fi
+    printf "."
+    sleep 5
+done
+echo ""
 
-if [ -n "$BODY" ]; then
-    echo "$BODY" > "$ARTIFACTS_DIR/octoprint-ui.html"
-    echo "  Saved OctoPrint HTML to artifacts"
+if [ "$WIZARD_READY" -eq 0 ]; then
+    echo "  WARNING: CONFIG_WIZARD not found after 120s, saving current page"
+    if [ -n "$BODY" ]; then
+        echo "$BODY" > "$ARTIFACTS_DIR/octoprint-ui.html"
+    fi
 fi
 
-# Attempt headless screenshot from inside the container if a browser is available
 HTTP_PORT="${QEMU_HTTP_PORT:-8080}"
 for BROWSER in chromium chromium-browser google-chrome; do
     if command -v "$BROWSER" &>/dev/null; then
         echo "  Using $BROWSER for headless screenshot..."
         "$BROWSER" --headless --disable-gpu --no-sandbox \
-            --virtual-time-budget=10000 \
+            --virtual-time-budget=15000 \
             --screenshot="$ARTIFACTS_DIR/screenshot.png" \
             --window-size=1280,720 \
             "http://localhost:${HTTP_PORT}" 2>/dev/null || true

testing/tests/test_octoprint_web.sh

@@ -9,21 +9,21 @@ PASS="raspberry"
 
 SSH_CMD="sshpass -p $PASS ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o PreferredAuthentications=password -o PubkeyAuthentication=no -o LogLevel=ERROR -p $PORT ${USER}@${HOST}"
 
-echo "Test: OctoPrint web server is accessible and fully started"
+echo "Test: OctoPrint web server is accessible with CONFIG_WIZARD"
 
 OCTOPRINT_READY=0
-for i in $(seq 1 60); do
+for i in $(seq 1 120); do
     BODY=$($SSH_CMD "curl -s http://localhost" 2>/dev/null || echo "")
     HTTP_CODE=$($SSH_CMD "curl -s -o /dev/null -w '%{http_code}' http://localhost" 2>/dev/null || echo "000")
 
     if [ "$HTTP_CODE" = "200" ]; then
-        if echo "$BODY" | grep -q "starting up"; then
-            printf "S"
-        elif echo "$BODY" | grep -q "CONFIG_WIZARD\|OctoPrint"; then
+        if echo "$BODY" | grep -q "CONFIG_WIZARD"; then
             OCTOPRINT_READY=1
             break
+        elif echo "$BODY" | grep -q "starting up\|still starting"; then
+            printf "S"
         else
-            printf "W"
+            printf "?"
         fi
     else
         printf "."
@@ -33,23 +33,23 @@ done
 echo ""
 
 if [ "$OCTOPRINT_READY" -eq 0 ]; then
-    echo "  FAIL: OctoPrint did not fully start within 300s"
+    echo "  FAIL: OctoPrint CONFIG_WIZARD did not appear within 600s"
+    echo "  Last HTTP code: $HTTP_CODE"
+    echo "  Last body (first 200 chars): $(echo "$BODY" | head -c 200)"
     exit 1
 fi
 
-echo "  OctoPrint web server is fully started (HTTP 200, UI loaded)"
-
-FULL_HTML=$($SSH_CMD "curl -s http://localhost" 2>/dev/null)
+echo "  OctoPrint CONFIG_WIZARD is loaded (HTTP 200)"
 
 if [ -n "$ARTIFACTS_DIR" ]; then
-    echo "$FULL_HTML" > "$ARTIFACTS_DIR/octoprint.html"
-    echo "  Saved HTML to $ARTIFACTS_DIR/octoprint.html"
+    echo "$BODY" > "$ARTIFACTS_DIR/octoprint.html"
+    echo "  Saved wizard HTML to $ARTIFACTS_DIR/octoprint.html"
 fi
 
-if echo "$FULL_HTML" | grep -q "OctoPrint"; then
-    echo "  PASS: OctoPrint web UI returned expected content"
+if echo "$BODY" | grep -q "OctoPrint"; then
+    echo "  PASS: OctoPrint wizard page returned expected content"
     exit 0
 else
-    echo "  FAIL: Response did not contain 'OctoPrint'"
+    echo "  FAIL: Wizard page did not contain 'OctoPrint'"
     exit 1
 fi