From 58f73e56aba783f4bdb64f8888e733d39b12f80a Mon Sep 17 00:00:00 2001
From: Austin Burdine <austin@ghost.org>
Date: Thu, 8 Oct 2026 15:21:17 -0400
Subject: [PATCH] Accepted the manager's own refusal of a host-held port in the
 e2e test

The manager now asks the host, through host.docker.internal, whether a
requested --port is held by a program Docker does not manage, and
refuses it before writing anything. On OrbStack and Docker Desktop that
refusal comes first, so the step expecting Docker's bind error failed
on its first check.

The step now accepts either refusal: the manager's, where it can see
the host's ports, or Docker's bind error on Linux. Both still check
that the directory is empty, no containers are left, the holder is
alive and a free --port succeeds. The Linux branch also checks the
whole "choose another for Ghost with --port" phrase; a stray `--`
argument had made it match any `--` in the output.
---
 tests/e2e/install.sh | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/tests/e2e/install.sh b/tests/e2e/install.sh
index d8b72f72..0a79d192 100755
--- a/tests/e2e/install.sh
+++ b/tests/e2e/install.sh
@@ -273,21 +273,31 @@ s.bind(("127.0.0.1", int(sys.argv[1]))); s.listen(); time.sleep(900)' "$busy" &
     sleep 1
     run install_alone "$P" --local --port "$busy"
     if ((RC == 0)) && [[ $(uname -s) != Linux ]]; then
-        # Docker Desktop refuses the port; OrbStack forwards it regardless,
-        # so the conflict cannot be seen from a container there at all.
+        # Docker Desktop and OrbStack publish over the program holding the
+        # port; the manager refuses first only when it can reach the host.
         skip "$operating_system published $busy over the program holding it, without an error"
         compose_in "$P" down --volumes >/dev/null 2>&1
     else
         expect_status 1
-        # Docker's own words name the port; the manager adds what to do.
-        expect_output "127\\.0\\.0\\.1:$busy"
-        expect_output 'already (in use|allocated)'
-        expect_output -- 'choose another for Ghost with --port'
-        expect_output 'Nothing that was already running was stopped'
+        if grep -qE 'already in use on this host by something outside Docker' <<<"$OUT"; then
+            # Where the manager can see the host's ports (Docker Desktop,
+            # OrbStack), it refuses the port before writing anything.
+            expect_output '--port'
+            expect_output 'Nothing has been changed'
+            refused="refused before anything was written, naming --port"
+        else
+            # On Linux, Docker's own words name the port; the manager adds
+            # what to do.
+            expect_output "127\\.0\\.0\\.1:$busy"
+            expect_output 'already (in use|allocated)'
+            expect_output 'choose another for Ghost with --port'
+            expect_output 'Nothing that was already running was stopped'
+            refused="an error naming the port and --port"
+        fi
         [[ -z $(ls -A "$P") ]] || fail "the failed installation left files behind" "$(ls -A "$P")"
         [[ -z $(compose_in "$P" ps --all --quiet 2>/dev/null || true) ]] || fail "it left containers behind"
         kill -0 "$HOLDER" || fail "the program holding the port was stopped"
-        ok "an error naming the port and --port, the directory as it was, the holder untouched"
+        ok "$refused, the directory as it was, the holder untouched"
         run install_alone "$P" --local --port 24772
         expect_status 0
         ok "the same command with a free --port succeeds"