Lots of cleanup

Author: NoahStapp

justfile

@@ -62,6 +62,10 @@ lint-manual:
 test *args="-v --durations=5 --maxfail=10":
     {{uv_run}} --extra test pytest {{args}}
 
+[group('test')]
+test-async *args="-v --durations=5 --maxfail=10 -m asyncio":
+    {{uv_run}} --extra test pytest {{args}}
+
 [group('test')]
 test-mockupdb *args:
     {{uv_run}} -v --extra test --group mockupdb pytest -m mockupdb {{args}}

pymongo/asynchronous/mongo_client.py

@@ -1418,7 +1418,8 @@ def __next__(self) -> NoReturn:
         raise TypeError("'AsyncMongoClient' object is not iterable")
 
     next = __next__
-    anext = next
+    if not _IS_SYNC:
+        anext = next
 
     async def _server_property(self, attr_name: str) -> Any:
         """An attribute of the current server's description.

pymongo/synchronous/mongo_client.py

@@ -1414,6 +1414,8 @@ def __next__(self) -> NoReturn:
         raise TypeError("'MongoClient' object is not iterable")
 
     next = __next__
+    if not _IS_SYNC:
+        next = next
 
     def _server_property(self, attr_name: str) -> Any:
         """An attribute of the current server's description.

pyproject.toml

@@ -94,7 +94,7 @@ zstd = ["requirements/zstd.txt"]
 
 [tool.pytest.ini_options]
 minversion = "7"
-addopts = ["-ra", "--strict-config", "--strict-markers", "--junitxml=xunit-results/TEST-results.xml", "-m default or default_async or asyncio"]
+addopts = ["-ra", "--strict-config", "--strict-markers", "--junitxml=xunit-results/TEST-results.xml", "-m default or default_async"]
 testpaths = ["test"]
 log_cli_level = "INFO"
 faulthandler_timeout = 1500
@@ -135,6 +135,8 @@ markers = [
     "mockupdb: tests that rely on mockupdb",
     "default: default test suite",
     "default_async: default async test suite",
+    "unit: tests that don't require a connection to MongoDB",
+    "integration: tests that require a connection to MongoDB",
 ]
 
 [tool.mypy]

test/__init__.py

@@ -15,18 +15,14 @@
 """Synchronous test suite for pymongo, bson, and gridfs."""
 from __future__ import annotations
 
-import asyncio
 import gc
-import logging
 import multiprocessing
 import os
 import signal
 import socket
 import subprocess
 import sys
-import threading
 import time
-import traceback
 import unittest
 import warnings
 from asyncio import iscoroutinefunction
@@ -53,6 +49,7 @@
     sanitize_reply,
 )
 
+from pymongo.lock import _create_lock
 from pymongo.uri_parser import parse_uri
 
 try:
@@ -116,7 +113,7 @@ def __init__(self):
         self.default_client_options: Dict = {}
         self.sessions_enabled = False
         self.client = None  # type: ignore
-        self.conn_lock = threading.Lock()
+        self.conn_lock = _create_lock()
         self.is_data_lake = False
         self.load_balancer = TEST_LOADBALANCER
         self.serverless = TEST_SERVERLESS
@@ -518,6 +515,12 @@ def require_data_lake(self, func):
             func=func,
         )
 
+    @property
+    def is_not_mmap(self):
+        if self.is_mongos:
+            return True
+        return self.storage_engine != "mmapv1"
+
     def require_no_mmap(self, func):
         """Run a test only if the server is not using the MMAPv1 storage
         engine. Only works for standalone and replica sets; tests are
@@ -571,6 +574,10 @@ def require_replica_set(self, func):
         """Run a test only if the client is connected to a replica set."""
         return self._require(lambda: self.is_rs, "Not connected to a replica set", func=func)
 
+    @property
+    def secondaries_count(self):
+        return 0 if not self.client else len(self.client.secondaries)
+
     def require_secondaries_count(self, count):
         """Run a test only if the client is connected to a replica set that has
         `count` secondaries.
@@ -690,7 +697,7 @@ def is_topology_type(self, topologies):
         if "sharded" in topologies and self.is_mongos:
             return True
         if "sharded-replicaset" in topologies and self.is_mongos:
-            shards = client_context.client.config.shards.find().to_list()
+            shards = self.client.config.shards.find().to_list()
             for shard in shards:
                 # For a 3-member RS-backed sharded cluster, shard['host']
                 # will be 'replicaName/ip1:port1,ip2:port2,ip3:port3'
@@ -864,6 +871,18 @@ def max_message_size_bytes(self):
 client_context = ClientContext()
 
 
+class PyMongoTestCasePyTest:
+    @contextmanager
+    def fail_point(self, client, command_args):
+        cmd_on = SON([("configureFailPoint", "failCommand")])
+        cmd_on.update(command_args)
+        client.admin.command(cmd_on)
+        try:
+            yield
+        finally:
+            client.admin.command("configureFailPoint", cmd_on["configureFailPoint"], mode="off")
+
+
 class PyMongoTestCase(unittest.TestCase):
     def assertEqualCommand(self, expected, actual, msg=None):
         self.assertEqual(sanitize_cmd(expected), sanitize_cmd(actual), msg)

test/asynchronous/__init__.py

@@ -872,6 +872,7 @@ async def max_message_size_bytes(self):
 # Reusable client context
 async_client_context = AsyncClientContext()
 
+
 class AsyncPyMongoTestCasePyTest:
     @asynccontextmanager
     async def fail_point(self, client, command_args):
@@ -1212,6 +1213,7 @@ async def asyncTearDown(self) -> None:
 
 
 async def async_setup():
+    await async_client_context.init()
     warnings.resetwarnings()
     warnings.simplefilter("always")
     global_knobs.enable()
@@ -1226,16 +1228,16 @@ async def async_teardown():
         garbage.append(f"  gc.get_referrers: {gc.get_referrers(g)!r}")
     if garbage:
         raise AssertionError("\n".join(garbage))
-    # c = async_client_context.client
-    # if c:
-    #     if not async_client_context.is_data_lake:
-    #         await c.drop_database("pymongo-pooling-tests")
-    #         await c.drop_database("pymongo_test")
-    #         await c.drop_database("pymongo_test1")
-    #         await c.drop_database("pymongo_test2")
-    #         await c.drop_database("pymongo_test_mike")
-    #         await c.drop_database("pymongo_test_bernie")
-    #     await c.close()
+    c = async_client_context.client
+    if c:
+        if not async_client_context.is_data_lake:
+            await c.drop_database("pymongo-pooling-tests")
+            await c.drop_database("pymongo_test")
+            await c.drop_database("pymongo_test1")
+            await c.drop_database("pymongo_test2")
+            await c.drop_database("pymongo_test_mike")
+            await c.drop_database("pymongo_test_bernie")
+        await c.close()
     print_running_clients()