File fix-netapi-rest_tornado-tests.patch of Package salt

From 3b184a3930a3c0f5845b2f5596dcf8f7df9402f8 Mon Sep 17 00:00:00 2001
From: Marek Czernek <marek.czernek@suse.com>
Date: Fri, 12 Sep 2025 16:26:16 +0200
Subject: [PATCH] Fix netapi/rest_tornado tests

Partial cherry-pick of https://github.com/saltstack/salt/commit/38d1df3b4672c1b5410567072b78cffb0c0eedaa
---
 salt/netapi/rest_tornado/saltnado_websockets.py  |  2 +-
 .../rest_tornado/test_websockets_handler.py      | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/salt/netapi/rest_tornado/saltnado_websockets.py b/salt/netapi/rest_tornado/saltnado_websockets.py
index 98d6400090..ed4120f829 100644
--- a/salt/netapi/rest_tornado/saltnado_websockets.py
+++ b/salt/netapi/rest_tornado/saltnado_websockets.py
@@ -326,7 +326,7 @@ class AllEventsHandler(
             log.debug("Refusing websocket connection, bad token!")
             self.send_error(401)
             return
-        super().get(token)
+        return super().get(token)
 
     def open(self, token):  # pylint: disable=W0221
         """
diff --git a/tests/pytests/functional/netapi/rest_tornado/test_websockets_handler.py b/tests/pytests/functional/netapi/rest_tornado/test_websockets_handler.py
index c6673ccd31..9566b9f3c8 100644
--- a/tests/pytests/functional/netapi/rest_tornado/test_websockets_handler.py
+++ b/tests/pytests/functional/netapi/rest_tornado/test_websockets_handler.py
@@ -16,7 +16,7 @@ pytestmark = [
 
 
 @pytest.fixture
-def app(client_config):
+def app(client_config, io_loop):
     client_config.setdefault("rest_tornado", {})["websockets"] = True
     return rest_tornado.get_application(client_config)
 
@@ -27,7 +27,7 @@ def http_server_port(http_server):
 
 
 async def test_websocket_handler_upgrade_to_websocket(
-    http_client, auth_creds, content_type_map, http_server_port
+    http_client, auth_creds, content_type_map, http_server_port, io_loop
 ):
     response = await http_client.fetch(
         "/login",
@@ -41,12 +41,12 @@ async def test_websocket_handler_upgrade_to_websocket(
     request = HTTPRequest(
         url, headers={"Origin": "http://example.com", "Host": "example.com"}
     )
-    ws = await websocket_connect(request)
-    ws.write_message("websocket client ready")
+    ws = await websocket_connect(request, connect_timeout=None)
+    await ws.write_message("websocket client ready")
     ws.close()
 
 
-async def test_websocket_handler_bad_token(client_config, http_server):
+async def test_websocket_handler_bad_token(client_config, http_server, io_loop):
     """
     A bad token should returns a 401 during a websocket connect
     """
@@ -64,7 +64,7 @@ async def test_websocket_handler_bad_token(client_config, http_server):
 
 
 async def test_websocket_handler_cors_origin_wildcard(
-    app, http_client, auth_creds, content_type_map, http_server_port
+    app, http_client, auth_creds, content_type_map, http_server_port, io_loop
 ):
     app.mod_opts["cors_origin"] = "*"
     response = await http_client.fetch(
@@ -85,7 +85,7 @@ async def test_websocket_handler_cors_origin_wildcard(
 
 
 async def test_cors_origin_single(
-    app, http_client, auth_creds, content_type_map, http_server_port
+    app, http_client, auth_creds, content_type_map, http_server_port, io_loop
 ):
     app.mod_opts["cors_origin"] = "http://example.com"
     response = await http_client.fetch(
@@ -116,7 +116,7 @@ async def test_cors_origin_single(
 
 
 async def test_cors_origin_multiple(
-    app, http_client, auth_creds, content_type_map, http_server_port
+    app, http_client, auth_creds, content_type_map, http_server_port, io_loop
 ):
     app.mod_opts["cors_origin"] = ["http://example.com", "http://foo.bar"]
 
-- 
2.51.0