run-tests.sh fix for async

mongodb · Jan 24, 2025 · cc3f1ad · cc3f1ad
1 parent 8602dde
commit cc3f1ad
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -267,22 +267,21 @@ if [ -z "$GREEN_FRAMEWORK" ]; then
     # https://docs.pytest.org/en/stable/how-to/capture-stdout-stderr.html
     PYTEST_ARGS="-v --capture=tee-sys --durations=5 $TEST_ARGS"
     if [ -n "$TEST_SUITES" ]; then
+      # Workaround until unittest -> pytest conversion is complete
+      # shellcheck disable=SC2206
+      ASYNC_PYTEST_ARGS=("-m asyncio and $TEST_SUITES" "--junitxml=xunit-results/TEST-asyncresults.xml" $PYTEST_ARGS)
       PYTEST_ARGS="-m $TEST_SUITES $PYTEST_ARGS"
     fi
     # shellcheck disable=SC2048
     uv run ${UV_ARGS[*]} pytest $PYTEST_ARGS
 
     # Workaround until unittest -> pytest conversion is complete
     if [ -z "$TEST_SUITES" ]; then
-      PYTEST_ARGS="-m asyncio --junitxml=xunit-results/TEST-asyncresults.xml $PYTEST_ARGS"
-      # shellcheck disable=SC2048
-      uv run ${UV_ARGS[*]} pytest $PYTEST_ARGS
-    else
-      PYTEST_ARGS="-m $TEST_SUITES and asyncio --junitxml=xunit-results/TEST-asyncresults.xml $PYTEST_ARGS"
-      # shellcheck disable=SC2048
-      uv run ${UV_ARGS[*]} pytest $PYTEST_ARGS
+      # shellcheck disable=SC2206
+      ASYNC_PYTEST_ARGS=("-m asyncio" "--junitxml=xunit-results/TEST-asyncresults.xml" $PYTEST_ARGS)
     fi
-
+    # shellcheck disable=SC2048
+    uv run ${UV_ARGS[*]} pytest "${ASYNC_PYTEST_ARGS[@]}"
 else
     # shellcheck disable=SC2048
     uv run ${UV_ARGS[*]} green_framework_test.py $GREEN_FRAMEWORK -v $TEST_ARGS

diff --git a/pymongo/asynchronous/mongo_client.py b/pymongo/asynchronous/mongo_client.py
@@ -1420,6 +1420,7 @@ def __next__(self) -> NoReturn:
     next = __next__
     if not _IS_SYNC:
         anext = next
+        __anext__ = next
 
     async def _server_property(self, attr_name: str) -> Any:
         """An attribute of the current server's description.

diff --git a/pymongo/synchronous/mongo_client.py b/pymongo/synchronous/mongo_client.py
@@ -1416,6 +1416,7 @@ def __next__(self) -> NoReturn:
     next = __next__
     if not _IS_SYNC:
         next = next
+        __next__ = next
 
     def _server_property(self, attr_name: str) -> Any:
         """An attribute of the current server's description.

diff --git a/test/asynchronous/test_client.py b/test/asynchronous/test_client.py
@@ -243,7 +243,7 @@ async def test_getattr(self, async_client):
         assert "has no attribute '_does_not_exist'" in str(context.value)
 
     async def test_iteration(self, async_client):
-        if _IS_SYNC:
+        if _IS_SYNC or sys.version_info < (3, 10):
             msg = "'AsyncMongoClient' object is not iterable"
         else:
             msg = "'AsyncMongoClient' object is not an async iterator"

diff --git a/test/test_client.py b/test/test_client.py
@@ -240,7 +240,7 @@ def test_getattr(self, client):
         assert "has no attribute '_does_not_exist'" in str(context.value)
 
     def test_iteration(self, client):
-        if _IS_SYNC:
+        if _IS_SYNC or sys.version_info < (3, 10):
             msg = "'MongoClient' object is not iterable"
         else:
             msg = "'MongoClient' object is not an async iterator"