PYTHON-5846 Fix test callers to unpack (servers, ss) tuple from select_servers/_select_server

Author: blink1073

test/asynchronous/test_mongos_load_balancing.py

@@ -61,7 +61,7 @@ async def do_simple_op(client, ntasks):
 async def writable_addresses(topology):
     return {
         server.description.address
-        for server in await topology.select_servers(writable_server_selector, _Op.TEST)
+        for server in (await topology.select_servers(writable_server_selector, _Op.TEST))[0]
     }
 
 

test/asynchronous/test_read_preferences.py

@@ -310,9 +310,9 @@ async def test_nearest(self):
         not_used = data_members.difference(used)
         latencies = ", ".join(
             "%s: %sms" % (server.description.address, server.description.round_trip_time)
-            for server in await (await c._get_topology()).select_servers(
-                readable_server_selector, _Op.TEST
-            )
+            for server in (
+                await (await c._get_topology()).select_servers(readable_server_selector, _Op.TEST)
+            )[0]
         )
 
         self.assertFalse(

test/asynchronous/utils.py

@@ -43,18 +43,14 @@
 async def async_get_pool(client: AsyncMongoClient) -> Pool:
     """Get the standalone, primary, or mongos pool."""
     topology = await client._get_topology()
-    server = await topology._select_server(writable_server_selector, _Op.TEST)
+    server, _ = await topology._select_server(writable_server_selector, _Op.TEST)
     return server.pool
 
 
 async def async_get_pools(client: AsyncMongoClient) -> list[Pool]:
     """Get all pools."""
-    return [
-        server.pool
-        for server in await (await client._get_topology()).select_servers(
-            any_server_selector, _Op.TEST
-        )
-    ]
+    servers, _ = await (await client._get_topology()).select_servers(any_server_selector, _Op.TEST)
+    return [server.pool for server in servers]
 
 
 async def async_wait_until(predicate, success_description, timeout=10):

test/asynchronous/utils_selection_tests.py

@@ -150,13 +150,13 @@ async def run_scenario(self):
 
             return
 
-        actual_suitable_s = await top_suitable.select_servers(
+        actual_suitable_s, _ = await top_suitable.select_servers(
             pref,
             _Op.TEST,
             server_selection_timeout=0,
             deprioritized_servers=top_suitable_deprioritized_servers,
         )
-        actual_latency_s = await top_latency.select_servers(
+        actual_latency_s, _ = await top_latency.select_servers(
             pref,
             _Op.TEST,
             server_selection_timeout=0,

test/test_mongos_load_balancing.py

@@ -61,7 +61,7 @@ def do_simple_op(client, ntasks):
 def writable_addresses(topology):
     return {
         server.description.address
-        for server in topology.select_servers(writable_server_selector, _Op.TEST)
+        for server in (topology.select_servers(writable_server_selector, _Op.TEST))[0]
     }
 
 

test/test_read_preferences.py

@@ -292,7 +292,9 @@ def test_nearest(self):
         not_used = data_members.difference(used)
         latencies = ", ".join(
             "%s: %sms" % (server.description.address, server.description.round_trip_time)
-            for server in (c._get_topology()).select_servers(readable_server_selector, _Op.TEST)
+            for server in ((c._get_topology()).select_servers(readable_server_selector, _Op.TEST))[
+                0
+            ]
         )
 
         self.assertFalse(

test/utils.py

@@ -43,16 +43,14 @@
 def get_pool(client: MongoClient) -> Pool:
     """Get the standalone, primary, or mongos pool."""
     topology = client._get_topology()
-    server = topology._select_server(writable_server_selector, _Op.TEST)
+    server, _ = topology._select_server(writable_server_selector, _Op.TEST)
     return server.pool
 
 
 def get_pools(client: MongoClient) -> list[Pool]:
     """Get all pools."""
-    return [
-        server.pool
-        for server in (client._get_topology()).select_servers(any_server_selector, _Op.TEST)
-    ]
+    servers, _ = (client._get_topology()).select_servers(any_server_selector, _Op.TEST)
+    return [server.pool for server in servers]
 
 
 def wait_until(predicate, success_description, timeout=10):

test/utils_selection_tests.py

@@ -150,13 +150,13 @@ def run_scenario(self):
 
             return
 
-        actual_suitable_s = top_suitable.select_servers(
+        actual_suitable_s, _ = top_suitable.select_servers(
             pref,
             _Op.TEST,
             server_selection_timeout=0,
             deprioritized_servers=top_suitable_deprioritized_servers,
         )
-        actual_latency_s = top_latency.select_servers(
+        actual_latency_s, _ = top_latency.select_servers(
             pref,
             _Op.TEST,
             server_selection_timeout=0,