From fba872909559c42ac48b6acd697e61ab987e0f71 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Wed, 7 Jan 2026 21:54:53 +0000
Subject: test: fix hanging unit tests issue

---
 tests/common/mock_relay.rs | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'tests/common/mock_relay.rs')

diff --git a/tests/common/mock_relay.rs b/tests/common/mock_relay.rs
index 123c29e..b6376a7 100644
--- a/tests/common/mock_relay.rs
+++ b/tests/common/mock_relay.rs
@@ -72,14 +72,35 @@ impl MockRelay {
     /// The relay accepts all events without validation and stores them
     /// in an in-memory database.
     pub async fn start() -> Self {
-        let port = find_free_port();
-        Self::start_on_port(port).await
+        // Create and bind listener (eliminates port race condition)
+        let std_listener = std::net::TcpListener::bind("127.0.0.1:0")
+            .expect("Failed to bind to random port");
+        let port = std_listener
+            .local_addr()
+            .expect("Failed to get local addr")
+            .port();
+
+        // Convert to tokio listener (keeps port bound)
+        std_listener
+            .set_nonblocking(true)
+            .expect("Failed to set non-blocking");
+        let listener = TcpListener::from_std(std_listener)
+            .expect("Failed to convert to tokio listener");
+
+        Self::start_with_listener(listener, port).await
     }
 
     /// Start a mock relay on a specific port.
     pub async fn start_on_port(port: u16) -> Self {
         let addr: SocketAddr = ([127, 0, 0, 1], port).into();
+        let listener = TcpListener::bind(addr)
+            .await
+            .expect("Failed to bind to address");
+        Self::start_with_listener(listener, port).await
+    }
 
+    /// Internal method to start the relay with an existing listener.
+    async fn start_with_listener(listener: TcpListener, port: u16) -> Self {
         // Create a simple relay with no write policy (accepts all events)
         let relay = LocalRelayBuilder::default().build();
 
@@ -89,11 +110,6 @@ impl MockRelay {
         // Clone relay for the server task
         let server_relay = relay.clone();
 
-        // Start the HTTP/WebSocket server
-        let listener = TcpListener::bind(addr)
-            .await
-            .expect("Failed to bind to address");
-
         let handle = tokio::spawn(async move {
             loop {
                 tokio::select! {
@@ -245,19 +261,6 @@ fn derive_accept_key(request_key: &[u8]) -> String {
     base64::Engine::encode(&base64::engine::general_purpose::STANDARD, hash.as_byte_array())
 }
 
-/// Find a free port to use for the server.
-fn find_free_port() -> u16 {
-    use std::net::TcpListener;
-
-    let listener = TcpListener::bind("127.0.0.1:0").expect("Failed to bind to random port");
-    let port = listener
-        .local_addr()
-        .expect("Failed to get local addr")
-        .port();
-    drop(listener);
-    port
-}
-
 /// Wait for the server to be ready to accept connections.
 async fn wait_for_server_ready(port: u16) {
     let max_attempts = 50; // 5 seconds total
-- 
cgit v1.2.3