fix: Attempt to fix the Mongo versioning across multiple versions of Mongo driver / server

Author: gencurrent

tests/mongo_tests/test_async_mongo_core.py

@@ -1,82 +1,64 @@
 """Tests for async Mongo client with async functions."""
 
 import asyncio
-from contextlib import suppress
 from random import random
 
 import pytest
 
 from cachier import cachier
+from tests.mongo_tests.test_mongo_core import _test_mongetter
 
 
 @pytest.mark.mongo
-@pytest.mark.filterwarnings("ignore:Python 3\\.14 will, by default, filter extracted tar archives.*:DeprecationWarning")
 @pytest.mark.asyncio
 async def test_async_mongo_mongetter():
-    pymongo_inmemory = pytest.importorskip("pymongo_inmemory")
-
     from cachier.cores.mongo import _MongoCore
 
-    client = pymongo_inmemory.MongoClient()
-    try:
-        collection = client["cachier_test"]["cachier_async_mongetter"]
-        collection.delete_many({})
+    base_collection = _test_mongetter()
+    collection = base_collection.database["cachier_async_mongetter"]
+    collection.delete_many({})
 
-        async def async_mongetter():
-            return collection
+    async def async_mongetter():
+        return collection
 
-        @cachier(mongetter=async_mongetter)
-        async def async_cached_mongo(x: int) -> float:
-            await asyncio.sleep(0.01)
-            return random() + x
+    @cachier(mongetter=async_mongetter)
+    async def async_cached_mongo(x: int) -> float:
+        await asyncio.sleep(0.01)
+        return random() + x
 
-        val1 = await async_cached_mongo(7)
-        val2 = await async_cached_mongo(7)
-        assert val1 == val2
+    val1 = await async_cached_mongo(7)
+    val2 = await async_cached_mongo(7)
+    assert val1 == val2
 
-        assert _MongoCore._INDEX_NAME in collection.index_information()
-    finally:
-        # pymongo_inmemory doesn't close the internal health-check client.
-        # Close it to avoid ResourceWarning being treated as an error.
-        with suppress(Exception):
-            client._mongod._client.close()  # type: ignore[attr-defined]
-        client.close()
+    assert _MongoCore._INDEX_NAME in collection.index_information()
 
 
 @pytest.mark.mongo
-@pytest.mark.filterwarnings("ignore:Python 3\\.14 will, by default, filter extracted tar archives.*:DeprecationWarning")
 @pytest.mark.asyncio
 async def test_async_mongo_mongetter_method_args_and_kwargs():
-    pymongo_inmemory = pytest.importorskip("pymongo_inmemory")
-
     from cachier.cores.mongo import _MongoCore
 
-    client = pymongo_inmemory.MongoClient()
-    try:
-        collection = client["cachier_test"]["cachier_async_mongetter_methods"]
-        collection.delete_many({})
-
-        async def async_mongetter():
-            return collection
-
-        call_count = 0
-
-        class _MongoMethods:
-            @cachier(mongetter=async_mongetter)
-            async def async_cached_mongo_method_args_kwargs(self, x: int, y: int) -> int:
-                nonlocal call_count
-                call_count += 1
-                await asyncio.sleep(0.01)
-                return call_count
-
-        obj = _MongoMethods()
-        val1 = await obj.async_cached_mongo_method_args_kwargs(4, 5)
-        val2 = await obj.async_cached_mongo_method_args_kwargs(y=5, x=4)
-        assert val1 == val2 == 1
-        assert call_count == 1
-
-        assert _MongoCore._INDEX_NAME in collection.index_information()
-    finally:
-        with suppress(Exception):
-            client._mongod._client.close()  # type: ignore[attr-defined]
-        client.close()
+    base_collection = _test_mongetter()
+    collection = base_collection.database["cachier_async_mongetter_methods"]
+    collection.delete_many({})
+
+    async def async_mongetter():
+        return collection
+
+    call_count = 0
+
+    class _MongoMethods:
+        @cachier(mongetter=async_mongetter)
+        async def async_cached_mongo_method_args_kwargs(self, x: int, y: int) -> int:
+            nonlocal call_count
+            call_count += 1
+            await asyncio.sleep(0.01)
+            return call_count
+
+    obj = _MongoMethods()
+    val1 = await obj.async_cached_mongo_method_args_kwargs(4, 5)
+    val2 = await obj.async_cached_mongo_method_args_kwargs(y=5, x=4)
+    assert val1 == val2 == 1
+    assert call_count == 1
+
+    assert _MongoCore._INDEX_NAME in collection.index_information()