PYTHON-5109 - Convert test.test_versioned_api to async

test/asynchronous/test_versioned_api_integration.py

@@ -0,0 +1,86 @@
+# Copyright 2020-present MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import annotations
+
+import os
+import sys
+from pathlib import Path
+from test.asynchronous.unified_format import generate_test_classes
+
+sys.path[0:0] = [""]
+
+from test.asynchronous import AsyncIntegrationTest, async_client_context, unittest
+from test.utils import OvertCommandListener
+
+from pymongo.server_api import ServerApi
+
+_IS_SYNC = False
+
+# Location of JSON test specifications.
+if _IS_SYNC:
+    TEST_PATH = os.path.join(Path(__file__).resolve().parent, "versioned-api")
+else:
+    TEST_PATH = os.path.join(Path(__file__).resolve().parent.parent, "versioned-api")
+
+
+# Generate unified tests.
+globals().update(generate_test_classes(TEST_PATH, module=__name__))
+
+
+class TestServerApiIntegration(AsyncIntegrationTest):
+    RUN_ON_LOAD_BALANCER = True
+    RUN_ON_SERVERLESS = True
+
+    def assertServerApi(self, event):
+        self.assertIn("apiVersion", event.command)
+        self.assertEqual(event.command["apiVersion"], "1")
+
+    def assertServerApiInAllCommands(self, events):
+        for event in events:
+            self.assertServerApi(event)
+
+    @async_client_context.require_version_min(4, 7)
+    async def test_command_options(self):
+        listener = OvertCommandListener()
+        client = await self.async_rs_or_single_client(
+            server_api=ServerApi("1"), event_listeners=[listener]
+        )
+        coll = client.test.test
+        await coll.insert_many([{} for _ in range(100)])
+        self.addAsyncCleanup(coll.delete_many, {})
+        await coll.find(batch_size=25).to_list()
+        await client.admin.command("ping")
+        self.assertServerApiInAllCommands(listener.started_events)
+
+    @async_client_context.require_version_min(4, 7)
+    @async_client_context.require_transactions
+    async def test_command_options_txn(self):
+        listener = OvertCommandListener()
+        client = await self.async_rs_or_single_client(
+            server_api=ServerApi("1"), event_listeners=[listener]
+        )
+        coll = client.test.test
+        await coll.insert_many([{} for _ in range(100)])
+        self.addAsyncCleanup(coll.delete_many, {})
+
+        listener.reset()
+        async with client.start_session() as s, await s.start_transaction():
+            await coll.insert_many([{} for _ in range(100)], session=s)
+            await coll.find(batch_size=25, session=s).to_list()
+            await client.test.command("find", "test", session=s)
+            self.assertServerApiInAllCommands(listener.started_events)
+
+
+if __name__ == "__main__":
+    unittest.main()

test/test_versioned_api.py

@@ -13,28 +13,18 @@
 # limitations under the License.
 from __future__ import annotations
 
-import os
 import sys
+from test import UnitTest
 
 sys.path[0:0] = [""]
 
-from test import IntegrationTest, client_context, unittest
-from test.unified_format import generate_test_classes
-from test.utils import OvertCommandListener
+from test import unittest
 
+from pymongo.mongo_client import MongoClient
 from pymongo.server_api import ServerApi, ServerApiVersion
-from pymongo.synchronous.mongo_client import MongoClient
 
-TEST_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "versioned-api")
-
-# Generate unified tests.
-globals().update(generate_test_classes(TEST_PATH, module=__name__))
-
-
-class TestServerApi(IntegrationTest):
-    RUN_ON_LOAD_BALANCER = True
-    RUN_ON_SERVERLESS = True
 
+class TestServerApi(UnitTest):
     def test_server_api_defaults(self):
         api = ServerApi(ServerApiVersion.V1)
         self.assertEqual(api.version, "1")
@@ -74,35 +64,6 @@ def assertServerApiInAllCommands(self, events):
         for event in events:
             self.assertServerApi(event)
 
-    @client_context.require_version_min(4, 7)
-    def test_command_options(self):
-        listener = OvertCommandListener()
-        client = self.rs_or_single_client(server_api=ServerApi("1"), event_listeners=[listener])
-        self.addCleanup(client.close)
-        coll = client.test.test
-        coll.insert_many([{} for _ in range(100)])
-        self.addCleanup(coll.delete_many, {})
-        list(coll.find(batch_size=25))
-        client.admin.command("ping")
-        self.assertServerApiInAllCommands(listener.started_events)
-
-    @client_context.require_version_min(4, 7)
-    @client_context.require_transactions
-    def test_command_options_txn(self):
-        listener = OvertCommandListener()
-        client = self.rs_or_single_client(server_api=ServerApi("1"), event_listeners=[listener])
-        self.addCleanup(client.close)
-        coll = client.test.test
-        coll.insert_many([{} for _ in range(100)])
-        self.addCleanup(coll.delete_many, {})
-
-        listener.reset()
-        with client.start_session() as s, s.start_transaction():
-            coll.insert_many([{} for _ in range(100)], session=s)
-            list(coll.find(batch_size=25, session=s))
-            client.test.command("find", "test", session=s)
-            self.assertServerApiInAllCommands(listener.started_events)
-
 
 if __name__ == "__main__":
     unittest.main()

test/test_versioned_api_integration.py

@@ -0,0 +1,82 @@
+# Copyright 2020-present MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import annotations
+
+import os
+import sys
+from pathlib import Path
+from test.unified_format import generate_test_classes
+
+sys.path[0:0] = [""]
+
+from test import IntegrationTest, client_context, unittest
+from test.utils import OvertCommandListener
+
+from pymongo.server_api import ServerApi
+
+_IS_SYNC = True
+
+# Location of JSON test specifications.
+if _IS_SYNC:
+    TEST_PATH = os.path.join(Path(__file__).resolve().parent, "versioned-api")
+else:
+    TEST_PATH = os.path.join(Path(__file__).resolve().parent.parent, "versioned-api")
+
+
+# Generate unified tests.
+globals().update(generate_test_classes(TEST_PATH, module=__name__))
+
+
+class TestServerApiIntegration(IntegrationTest):
+    RUN_ON_LOAD_BALANCER = True
+    RUN_ON_SERVERLESS = True
+
+    def assertServerApi(self, event):
+        self.assertIn("apiVersion", event.command)
+        self.assertEqual(event.command["apiVersion"], "1")
+
+    def assertServerApiInAllCommands(self, events):
+        for event in events:
+            self.assertServerApi(event)
+
+    @client_context.require_version_min(4, 7)
+    def test_command_options(self):
+        listener = OvertCommandListener()
+        client = self.rs_or_single_client(server_api=ServerApi("1"), event_listeners=[listener])
+        coll = client.test.test
+        coll.insert_many([{} for _ in range(100)])
+        self.addCleanup(coll.delete_many, {})
+        coll.find(batch_size=25).to_list()
+        client.admin.command("ping")
+        self.assertServerApiInAllCommands(listener.started_events)
+
+    @client_context.require_version_min(4, 7)
+    @client_context.require_transactions
+    def test_command_options_txn(self):
+        listener = OvertCommandListener()
+        client = self.rs_or_single_client(server_api=ServerApi("1"), event_listeners=[listener])
+        coll = client.test.test
+        coll.insert_many([{} for _ in range(100)])
+        self.addCleanup(coll.delete_many, {})
+
+        listener.reset()
+        with client.start_session() as s, s.start_transaction():
+            coll.insert_many([{} for _ in range(100)], session=s)
+            coll.find(batch_size=25, session=s).to_list()
+            client.test.command("find", "test", session=s)
+            self.assertServerApiInAllCommands(listener.started_events)
+
+
+if __name__ == "__main__":
+    unittest.main()

tools/synchro.py

@@ -231,6 +231,7 @@ def async_only_test(f: str) -> bool:
     "test_srv_polling.py",
     "test_transactions.py",
     "test_unified_format.py",
+    "test_versioned_api_integration.py",
     "unified_format.py",
 ]