Cleanup

Author: NoahStapp

test/asynchronous/test_bulk.py

@@ -165,7 +165,7 @@ async def _test_update_many(self, update):
     async def test_update_many(self):
         await self._test_update_many({"$set": {"foo": "bar"}})
 
-    @async_client_context.require_version_min(4, 1, 11)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_update_many_pipeline(self):
         await self._test_update_many([{"$set": {"foo": "bar"}}])
 
@@ -206,7 +206,7 @@ async def _test_update_one(self, update):
     async def test_update_one(self):
         await self._test_update_one({"$set": {"foo": "bar"}})
 
-    @async_client_context.require_version_min(4, 1, 11)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_update_one_pipeline(self):
         await self._test_update_one([{"$set": {"foo": "bar"}}])
 

test/asynchronous/test_change_stream.py

@@ -267,7 +267,7 @@ async def test_batch_size_is_honored(self):
 
     # $changeStream.startAtOperationTime was added in 4.0.0.
     @no_type_check
-    @async_client_context.require_version_min(4, 0, 0)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_start_at_operation_time(self):
         optime = await self.get_start_at_operation_time()
 
@@ -436,7 +436,7 @@ async def test_change_operations(self):
             await self._test_get_invalidate_event(change_stream)
 
     @no_type_check
-    @async_client_context.require_version_min(4, 1, 1)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_start_after(self):
         resume_token = await self.get_resume_token(invalidate=True)
 
@@ -452,7 +452,7 @@ async def test_start_after(self):
             self.assertEqual(change["fullDocument"], {"_id": 2})
 
     @no_type_check
-    @async_client_context.require_version_min(4, 1, 1)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_start_after_resume_process_with_changes(self):
         resume_token = await self.get_resume_token(invalidate=True)
 
@@ -563,27 +563,16 @@ async def _test_update_resume_token(self, expected_rt_getter):
                 )
 
     # Prose test no. 1
-    @async_client_context.require_version_min(4, 0, 7)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_update_resume_token(self):
         await self._test_update_resume_token(self._get_expected_resume_token)
 
-    # Prose test no. 1
-    @async_client_context.require_version_max(4, 0, 7)
-    async def test_update_resume_token_legacy(self):
-        await self._test_update_resume_token(self._get_expected_resume_token_legacy)
-
     # Prose test no. 2
-    @async_client_context.require_version_min(4, 1, 8)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_raises_error_on_missing_id_418plus(self):
         # Server returns an error on 4.1.8+
         await self._test_raises_error_on_missing_id(OperationFailure)
 
-    # Prose test no. 2
-    @async_client_context.require_version_max(4, 1, 8)
-    async def test_raises_error_on_missing_id_418minus(self):
-        # PyMongo raises an error
-        await self._test_raises_error_on_missing_id(InvalidOperation)
-
     # Prose test no. 3
     @no_type_check
     async def test_resume_on_error(self):
@@ -642,40 +631,12 @@ def raise_error():
             cursor.close = raise_error
             await self.insert_one_and_check(change_stream, {"_id": 2})
 
-    # Prose test no. 9
-    @no_type_check
-    @async_client_context.require_version_min(4, 0, 0)
-    @async_client_context.require_version_max(4, 0, 7)
-    async def test_start_at_operation_time_caching(self):
-        # Case 1: change stream not started with startAtOperationTime
-        client, listener = self.client_with_listener("aggregate")
-        async with await self.change_stream_with_client(client) as cs:
-            await self.kill_change_stream_cursor(cs)
-            await cs.try_next()
-        cmd = listener.started_events[-1].command
-        self.assertIsNotNone(cmd["pipeline"][0]["$changeStream"].get("startAtOperationTime"))
-
-        # Case 2: change stream started with startAtOperationTime
-        listener.reset()
-        optime = await self.get_start_at_operation_time()
-        async with await self.change_stream_with_client(
-            client, start_at_operation_time=optime
-        ) as cs:
-            await self.kill_change_stream_cursor(cs)
-            await cs.try_next()
-        cmd = listener.started_events[-1].command
-        self.assertEqual(
-            cmd["pipeline"][0]["$changeStream"].get("startAtOperationTime"),
-            optime,
-            str([k.command for k in listener.started_events]),
-        )
-
     # Prose test no. 10 - SKIPPED
     # This test is identical to prose test no. 3.
 
     # Prose test no. 11
     @no_type_check
-    @async_client_context.require_version_min(4, 0, 7)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_resumetoken_empty_batch(self):
         client, listener = await self._client_with_listener("getMore")
         async with await self.change_stream_with_client(client) as change_stream:
@@ -687,7 +648,7 @@ async def test_resumetoken_empty_batch(self):
 
     # Prose test no. 11
     @no_type_check
-    @async_client_context.require_version_min(4, 0, 7)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_resumetoken_exhausted_batch(self):
         client, listener = await self._client_with_listener("getMore")
         async with await self.change_stream_with_client(client) as change_stream:
@@ -697,38 +658,6 @@ async def test_resumetoken_exhausted_batch(self):
         response = listener.succeeded_events[-1].reply
         self.assertEqual(resume_token, response["cursor"]["postBatchResumeToken"])
 
-    # Prose test no. 12
-    @no_type_check
-    @async_client_context.require_version_max(4, 0, 7)
-    async def test_resumetoken_empty_batch_legacy(self):
-        resume_point = await self.get_resume_token()
-
-        # Empty resume token when neither resumeAfter or startAfter specified.
-        async with await self.change_stream() as change_stream:
-            await change_stream.try_next()
-            self.assertIsNone(change_stream.resume_token)
-
-        # Resume token value is same as resumeAfter.
-        async with await self.change_stream(resume_after=resume_point) as change_stream:
-            await change_stream.try_next()
-            resume_token = change_stream.resume_token
-            self.assertEqual(resume_token, resume_point)
-
-    # Prose test no. 12
-    @no_type_check
-    @async_client_context.require_version_max(4, 0, 7)
-    async def test_resumetoken_exhausted_batch_legacy(self):
-        # Resume token is _id of last change.
-        async with await self.change_stream() as change_stream:
-            change = await self._populate_and_exhaust_change_stream(change_stream)
-            self.assertEqual(change_stream.resume_token, change["_id"])
-            resume_point = change["_id"]
-
-        # Resume token is _id of last change even if resumeAfter is specified.
-        async with await self.change_stream(resume_after=resume_point) as change_stream:
-            change = await self._populate_and_exhaust_change_stream(change_stream)
-            self.assertEqual(change_stream.resume_token, change["_id"])
-
     # Prose test no. 13
     @no_type_check
     async def test_resumetoken_partially_iterated_batch(self):
@@ -770,13 +699,13 @@ async def test_resumetoken_uniterated_nonempty_batch_resumeafter(self):
     # Prose test no. 14
     @no_type_check
     @async_client_context.require_no_mongos
-    @async_client_context.require_version_min(4, 1, 1)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_resumetoken_uniterated_nonempty_batch_startafter(self):
         await self._test_resumetoken_uniterated_nonempty_batch("start_after")
 
     # Prose test no. 17
     @no_type_check
-    @async_client_context.require_version_min(4, 1, 1)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_startafter_resume_uses_startafter_after_empty_getMore(self):
         # Resume should use startAfter after no changes have been returned.
         resume_point = await self.get_resume_token()
@@ -796,7 +725,7 @@ async def test_startafter_resume_uses_startafter_after_empty_getMore(self):
 
     # Prose test no. 18
     @no_type_check
-    @async_client_context.require_version_min(4, 1, 1)
+    @async_client_context.require_version_min(4, 2, 0)
     async def test_startafter_resume_uses_resumeafter_after_nonempty_getMore(self):
         # Resume should use resumeAfter after some changes have been returned.
         resume_point = await self.get_resume_token()
@@ -843,7 +772,7 @@ async def test_split_large_change(self):
 class TestClusterAsyncChangeStream(TestAsyncChangeStreamBase, APITestsMixin):
     dbs: list
 
-    @async_client_context.require_version_min(4, 0, 0, -1)
+    @async_client_context.require_version_min(4, 2, 0)
     @async_client_context.require_change_streams
     async def asyncSetUp(self) -> None:
         await super().asyncSetUp()
@@ -903,7 +832,7 @@ async def test_full_pipeline(self):
 
 
 class TestAsyncDatabaseAsyncChangeStream(TestAsyncChangeStreamBase, APITestsMixin):
-    @async_client_context.require_version_min(4, 0, 0, -1)
+    @async_client_context.require_version_min(4, 2, 0)
     @async_client_context.require_change_streams
     async def asyncSetUp(self) -> None:
         await super().asyncSetUp()

test/asynchronous/test_connections_survive_primary_stepdown_spec.py

@@ -122,18 +122,12 @@ async def run_scenario(self, error_code, retry, pool_status_checker):
     async def test_not_primary_keep_connection_pool(self):
         await self.run_scenario(10107, True, self.verify_pool_not_cleared)
 
-    @async_client_context.require_version_min(4, 0, 0)
-    @async_client_context.require_version_max(4, 1, 0, -1)
-    @async_client_context.require_test_commands
-    async def test_not_primary_reset_connection_pool(self):
-        await self.run_scenario(10107, False, self.verify_pool_cleared)
-
-    @async_client_context.require_version_min(4, 0, 0)
+    @async_client_context.require_version_min(4, 2, 0)
     @async_client_context.require_test_commands
     async def test_shutdown_in_progress(self):
         await self.run_scenario(91, False, self.verify_pool_cleared)
 
-    @async_client_context.require_version_min(4, 0, 0)
+    @async_client_context.require_version_min(4, 2, 0)
     @async_client_context.require_test_commands
     async def test_interrupted_at_shutdown(self):
         await self.run_scenario(11600, False, self.verify_pool_cleared)

test/asynchronous/test_cursor.py

@@ -1190,15 +1190,6 @@ async def test_distinct(self):
 
         self.assertEqual(["b", "c"], distinct)
 
-    @async_client_context.require_version_max(4, 1, 0, -1)
-    async def test_max_scan(self):
-        await self.db.drop_collection("test")
-        await self.db.test.insert_many([{} for _ in range(100)])
-
-        self.assertEqual(100, len(await self.db.test.find().to_list()))
-        self.assertEqual(50, len(await self.db.test.find().max_scan(50).to_list()))
-        self.assertEqual(50, len(await self.db.test.find().max_scan(90).max_scan(50).to_list()))
-
     async def test_with_statement(self):
         await self.db.drop_collection("test")
         await self.db.test.insert_many([{} for _ in range(100)])

test/asynchronous/test_custom_types.py

@@ -953,7 +953,7 @@ async def create_targets(self, *args, **kwargs):
 class TestDatabaseChangeStreamsWCustomTypes(
     AsyncIntegrationTest, ChangeStreamsWCustomTypesTestMixin
 ):
-    @async_client_context.require_version_min(4, 0, 0)
+    @async_client_context.require_version_min(4, 2, 0)
     @async_client_context.require_change_streams
     async def asyncSetUp(self):
         await super().asyncSetUp()
@@ -973,7 +973,7 @@ async def create_targets(self, *args, **kwargs):
 class TestClusterChangeStreamsWCustomTypes(
     AsyncIntegrationTest, ChangeStreamsWCustomTypesTestMixin
 ):
-    @async_client_context.require_version_min(4, 0, 0)
+    @async_client_context.require_version_min(4, 2, 0)
     @async_client_context.require_change_streams
     async def asyncSetUp(self):
         await super().asyncSetUp()

test/asynchronous/test_encryption.py

@@ -451,20 +451,6 @@ class TestClientMaxWireVersion(AsyncIntegrationTest):
     async def asyncSetUp(self):
         await super().asyncSetUp()
 
-    @async_client_context.require_version_max(4, 0, 99)
-    async def test_raise_max_wire_version_error(self):
-        opts = AutoEncryptionOpts(KMS_PROVIDERS, "keyvault.datakeys")
-        client = await self.async_rs_or_single_client(auto_encryption_opts=opts)
-        msg = "Auto-encryption requires a minimum MongoDB version of 4.2"
-        with self.assertRaisesRegex(ConfigurationError, msg):
-            await client.test.test.insert_one({})
-        with self.assertRaisesRegex(ConfigurationError, msg):
-            await client.admin.command("ping")
-        with self.assertRaisesRegex(ConfigurationError, msg):
-            await client.test.test.find_one({})
-        with self.assertRaisesRegex(ConfigurationError, msg):
-            await client.test.test.bulk_write([InsertOne({})])
-
     async def test_raise_unsupported_error(self):
         opts = AutoEncryptionOpts(KMS_PROVIDERS, "keyvault.datakeys")
         client = await self.async_rs_or_single_client(auto_encryption_opts=opts)

test/asynchronous/test_session.py

@@ -1045,14 +1045,6 @@ async def test_writes_do_not_include_read_concern(self):
             lambda coll, session: coll.find({}, session=session).explain()
         )
 
-    @async_client_context.require_no_standalone
-    @async_client_context.require_version_max(4, 1, 0)
-    async def test_aggregate_out_does_not_include_read_concern(self):
-        async def alambda(coll, session):
-            await (await coll.aggregate([{"$out": "aggout"}], session=session)).to_list()
-
-        await self._test_no_read_concern(alambda)
-
     @async_client_context.require_no_standalone
     async def test_get_more_does_not_include_read_concern(self):
         coll = self.client.pymongo_test.test