fix timeout

Author: MoChilia

sdk/webpubsub/azure-messaging-webpubsubclient/tests/test_smoke_async.py

@@ -100,9 +100,7 @@ async def on_stop():
 
             # remove stopped event and close again
             await client.unsubscribe("stopped", on_stop)
-            disconnected_event.clear()
             await client.close()
-            await asyncio.wait_for(disconnected_event.wait(), timeout=30)
             assert not client.is_connected()
 
     @WebpubsubClientPowerShellPreparer()

sdk/webpubsub/azure-messaging-webpubsubservice/tests/test_live_api_coverage.py

@@ -25,9 +25,6 @@ def _find_connection_id(self, client, group_name, user_id):
             time.sleep(1)
         return None
 
-    def _wait_for_server_cleanup(self, delay_seconds=2):
-        time.sleep(delay_seconds)
-
     def _wait_for_connection_removed(self, client, connection_id):
         for _ in range(30):
             if not client.connection_exists(connection_id=connection_id):
@@ -175,7 +172,7 @@ def test_live_api_coverage_all_apis_and_parameters(self, webpubsub_endpoint, web
 
             # close_group_connections (connection auto-joins group_1 via token)
             ws.close()
-            self._wait_for_server_cleanup()
+            self._wait_for_connection_removed(client, connection_id)
             ws = ws_connect(access_token["url"], open_timeout=30)
             conn = self._find_connection_id(client, group_1, user_id)
             assert conn is not None
@@ -184,7 +181,6 @@ def test_live_api_coverage_all_apis_and_parameters(self, webpubsub_endpoint, web
             assert not client.connection_exists(connection_id=conn)
 
             # close_user_connections
-            self._wait_for_server_cleanup()
             ws = ws_connect(access_token["url"], open_timeout=30)
             conn = self._find_connection_id(client, group_1, user_id)
             assert conn is not None
@@ -193,7 +189,6 @@ def test_live_api_coverage_all_apis_and_parameters(self, webpubsub_endpoint, web
             assert not client.connection_exists(connection_id=conn)
 
             # close_connection
-            self._wait_for_server_cleanup()
             ws = ws_connect(access_token["url"], open_timeout=30)
             conn = self._find_connection_id(client, group_1, user_id)
             assert conn is not None
@@ -202,7 +197,6 @@ def test_live_api_coverage_all_apis_and_parameters(self, webpubsub_endpoint, web
             assert not client.connection_exists(connection_id=conn)
 
             # close_all_connections
-            self._wait_for_server_cleanup()
             ws = ws_connect(access_token["url"], open_timeout=30)
             conn = self._find_connection_id(client, group_1, user_id)
             assert conn is not None

sdk/webpubsub/azure-messaging-webpubsubservice/tests/test_live_api_coverage_async.py

@@ -27,18 +27,6 @@ async def _find_connection_id(self, client, group_name, user_id):
             await asyncio.sleep(1)
         return None
 
-    async def _wait_for_server_cleanup(self, delay_seconds=2):
-        """
-        Wait for server-side cleanup after closing a connection.
-        
-        The server needs time to process the disconnection before accepting new connections.
-        This is a pragmatic wait since we don't have a direct signal for when cleanup completes.
-        
-        Args:
-            delay_seconds: Time to wait in seconds (default 2 seconds for server cleanup)
-        """
-        await asyncio.sleep(delay_seconds)
-
     async def _wait_for_connection_removed(self, client, connection_id):
         for _ in range(30):
             if not await client.connection_exists(connection_id=connection_id):
@@ -214,7 +202,7 @@ async def test_live_api_coverage_all_apis_and_parameters_async(
 
                 # close_group_connections (connection auto-joins group_1 via token)
                 await ws.close()
-                await self._wait_for_server_cleanup()
+                await self._wait_for_connection_removed(client, connection_id)
                 ws = await ws_connect(access_token["url"], open_timeout=30)
                 conn = await self._find_connection_id(client, group_1, user_id)
                 assert conn is not None
@@ -223,7 +211,6 @@ async def test_live_api_coverage_all_apis_and_parameters_async(
                 assert not await client.connection_exists(connection_id=conn)
 
                 # close_user_connections
-                await self._wait_for_server_cleanup()
                 ws = await ws_connect(access_token["url"], open_timeout=30)
                 conn = await self._find_connection_id(client, group_1, user_id)
                 assert conn is not None
@@ -232,7 +219,6 @@ async def test_live_api_coverage_all_apis_and_parameters_async(
                 assert not await client.connection_exists(connection_id=conn)
 
                 # close_connection
-                await self._wait_for_server_cleanup()
                 ws = await ws_connect(access_token["url"], open_timeout=30)
                 conn = await self._find_connection_id(client, group_1, user_id)
                 assert conn is not None
@@ -241,7 +227,6 @@ async def test_live_api_coverage_all_apis_and_parameters_async(
                 assert not await client.connection_exists(connection_id=conn)
 
                 # close_all_connections
-                await self._wait_for_server_cleanup()
                 ws = await ws_connect(access_token["url"], open_timeout=30)
                 conn = await self._find_connection_id(client, group_1, user_id)
                 assert conn is not None