Address review

Author: NoahStapp

.evergreen/run-tests.sh

@@ -285,13 +285,11 @@ if [ -z "$GREEN_FRAMEWORK" ]; then
     exit_code=$?
 
     # shellcheck disable=SC2048
-    uv run ${UV_ARGS[*]} pytest "${ASYNC_PYTEST_ARGS[@]}" "--collect-only"
-    collected=$?
+    uv run ${UV_ARGS[*]} pytest "${ASYNC_PYTEST_ARGS[@]}"
+    async_exit_code=$?
     set -o errexit
-    # If we collected at least one async test, run all collected tests
-    if [ $collected -ne 5 ]; then
-      # shellcheck disable=SC2048
-      uv run ${UV_ARGS[*]} pytest "${ASYNC_PYTEST_ARGS[@]}"
+    if [ $async_exit_code -ne 5 ] && [ $async_exit_code -ne 0 ]; then
+      exit $async_exit_code
     fi
     if [ $exit_code -ne 0 ]; then
       exit $exit_code

test/asynchronous/pymongo_mocks.py

@@ -166,7 +166,7 @@ async def get_async_mock_client(
             standalones, members, mongoses, hello_hosts, arbiters, down_hosts, *args, **kwargs
         )
 
-        if "connect" not in kwargs or "connect" in kwargs and kwargs["connect"]:
+        if kwargs.get("connect", True):
             await c.aconnect()
         return c
 

test/asynchronous/test_client.py

@@ -2393,7 +2393,16 @@ class TestClientLazyConnect:
 
     @pytest.fixture
     def _get_client(self, async_rs_or_single_client):
-        return async_rs_or_single_client(connect=False)
+        clients = []
+
+        def _make_client():
+            client = async_rs_or_single_client(connect=False)
+            clients.append(client)
+            return client
+
+        yield _make_client
+        for client in clients:
+            client.close()
 
     def test_insert_one(self, _get_client, async_client_context_fixture):
         def reset(collection):

test/pymongo_mocks.py

@@ -165,7 +165,7 @@ def get_mock_client(
             standalones, members, mongoses, hello_hosts, arbiters, down_hosts, *args, **kwargs
         )
 
-        if "connect" not in kwargs or "connect" in kwargs and kwargs["connect"]:
+        if kwargs.get("connect", True):
             c._connect()
         return c
 

test/test_client.py

@@ -2297,7 +2297,16 @@ class TestClientLazyConnect:
 
     @pytest.fixture
     def _get_client(self, rs_or_single_client):
-        return rs_or_single_client(connect=False)
+        clients = []
+
+        def _make_client():
+            client = rs_or_single_client(connect=False)
+            clients.append(client)
+            return client
+
+        yield _make_client
+        for client in clients:
+            client.close()
 
     def test_insert_one(self, _get_client, client_context_fixture):
         def reset(collection):

test/utils.py

@@ -811,7 +811,7 @@ def frequent_thread_switches():
         sys.setswitchinterval(interval)
 
 
-def lazy_client_trial(reset, target, test, client, client_context):
+def lazy_client_trial(reset, target, test, get_client, client_context):
     """Test concurrent operations on a lazily-connecting client.
 
     `reset` takes a collection and resets it for the next trial.
@@ -827,7 +827,7 @@ def lazy_client_trial(reset, target, test, client, client_context):
     with frequent_thread_switches():
         for _i in range(NTRIALS):
             reset(collection)
-            lazy_client = client
+            lazy_client = get_client()
             lazy_collection = lazy_client.pymongo_test.test
             run_threads(lazy_collection, target)
             test(lazy_collection)