From d3e83b089943e2941dace3546a068a59bd0a335e Mon Sep 17 00:00:00 2001
From: Ysopwnable <161784452+N0zoM1z0@users.noreply.github.com>
Date: Mon, 12 Oct 2026 00:02:01 +0800
Subject: [PATCH] fix(test): wait for Hopper reconnect listener readiness
 (#1885)

The socket path exists after bind but before listen. Wait up to two seconds
for the initial connection on ConnectionRefusedError, closing each failed
socket. Propagate other errors and keep reconnect attempts immediate.
Preserve authentication, lost replies, expiry, cleanup and thread assertions.

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
Co-authored-by: Kaoru0822 <208281322+kaoru0822-kitauji@users.noreply.github.com>
---
 tests/fixtures/hopperBridgeReconnectProbe.py | 23 +++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/tests/fixtures/hopperBridgeReconnectProbe.py b/tests/fixtures/hopperBridgeReconnectProbe.py
index 1ba4bebea..ff462519d 100644
--- a/tests/fixtures/hopperBridgeReconnectProbe.py
+++ b/tests/fixtures/hopperBridgeReconnectProbe.py
@@ -45,11 +45,21 @@ def probe(path, socket_path, mode):
         assert time.monotonic() < deadline, failures
         time.sleep(0.005)
 
-    def connect():
-        client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        client.settimeout(2)
-        client.connect(socket_path)
-        return client, client.makefile("rwb")
+    def connect(wait_until_listening=False):
+        deadline = time.monotonic() + 2 if wait_until_listening else None
+        while True:
+            client = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+            client.settimeout(2)
+            try:
+                client.connect(socket_path)
+            except OSError as error:
+                client.close()
+                if (not isinstance(error, ConnectionRefusedError)
+                        or deadline is None or time.monotonic() >= deadline):
+                    raise
+                time.sleep(0.005)
+            else:
+                return client, client.makefile("rwb")
 
     def send(file, method, token="owned-token", params=None):
         file.write((json.dumps({"id": 1, "method": method, "token": token, "params": params or {}}) + "\n").encode())
@@ -63,7 +73,8 @@ def probe(path, socket_path, mode):
             if "event" not in value:
                 return value
 
-    client, file = connect()
+    # bind() creates the socket path before listen() makes it connectable.
+    client, file = connect(wait_until_listening=True)
     send(file, "health", "foreign-token" if mode == "unauthorized" else "owned-token")
     if mode == "lost-reply":
         assert entered.wait(2)