Fix test reqs

Author: NoahStapp

test/asynchronous/test_client.py

@@ -2597,6 +2597,7 @@ class TestClientCSOTProse(AsyncIntegrationTest):
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#timeoutms-is-refreshed-for-each-handshake-command
     @async_client_context.require_auth
     @async_client_context.require_version_min(4, 4, -1)
+    @async_client_context.require_failCommand_appName
     async def test_02_timeoutMS_refreshed_for_each_handshake_command(self):
         listener = CMAPListener()
 

test/asynchronous/test_collection.py

@@ -2281,6 +2281,7 @@ async def afind(*args, **kwargs):
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#1-multi-batch-inserts
     @async_client_context.require_standalone
     @async_client_context.require_version_min(4, 4, -1)
+    @async_client_context.require_failCommand_fail_point
     async def test_01_multi_batch_inserts(self):
         client = await self.async_single_client(read_preference=ReadPreference.PRIMARY_PREFERRED)
         await client.db.coll.drop()

test/asynchronous/test_encryption.py

@@ -3162,6 +3162,8 @@ async def asyncSetUp(self) -> None:
         )
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#createdatakey
+    @async_client_context.require_failCommand_fail_point
+    @async_client_context.require_version_min(4, 4, -1)
     async def test_01_create_data_key(self):
         async with self.fail_point(
             {
@@ -3178,6 +3180,8 @@ async def test_01_create_data_key(self):
         self.assertEqual("insert", events[0].command_name)
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#encrypt
+    @async_client_context.require_failCommand_fail_point
+    @async_client_context.require_version_min(4, 4, -1)
     async def test_02_encrypt(self):
         data_key_id = await self.client_encryption.create_data_key("local")
         self.assertEqual(4, data_key_id.subtype)
@@ -3200,6 +3204,8 @@ async def test_02_encrypt(self):
         self.assertEqual("find", events[0].command_name)
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#decrypt
+    @async_client_context.require_failCommand_fail_point
+    @async_client_context.require_version_min(4, 4, -1)
     async def test_03_decrypt(self):
         data_key_id = await self.client_encryption.create_data_key("local")
         self.assertEqual(4, data_key_id.subtype)

test/test_client.py

@@ -2553,6 +2553,7 @@ class TestClientCSOTProse(IntegrationTest):
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#timeoutms-is-refreshed-for-each-handshake-command
     @client_context.require_auth
     @client_context.require_version_min(4, 4, -1)
+    @client_context.require_failCommand_appName
     def test_02_timeoutMS_refreshed_for_each_handshake_command(self):
         listener = CMAPListener()
 

test/test_collection.py

@@ -2258,6 +2258,7 @@ def afind(*args, **kwargs):
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#1-multi-batch-inserts
     @client_context.require_standalone
     @client_context.require_version_min(4, 4, -1)
+    @client_context.require_failCommand_fail_point
     def test_01_multi_batch_inserts(self):
         client = self.single_client(read_preference=ReadPreference.PRIMARY_PREFERRED)
         client.db.coll.drop()

test/test_encryption.py

@@ -3144,6 +3144,8 @@ def setUp(self) -> None:
         )
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#createdatakey
+    @client_context.require_failCommand_fail_point
+    @client_context.require_version_min(4, 4, -1)
     def test_01_create_data_key(self):
         with self.fail_point(
             {
@@ -3160,6 +3162,8 @@ def test_01_create_data_key(self):
         self.assertEqual("insert", events[0].command_name)
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#encrypt
+    @client_context.require_failCommand_fail_point
+    @client_context.require_version_min(4, 4, -1)
     def test_02_encrypt(self):
         data_key_id = self.client_encryption.create_data_key("local")
         self.assertEqual(4, data_key_id.subtype)
@@ -3182,6 +3186,8 @@ def test_02_encrypt(self):
         self.assertEqual("find", events[0].command_name)
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#decrypt
+    @client_context.require_failCommand_fail_point
+    @client_context.require_version_min(4, 4, -1)
     def test_03_decrypt(self):
         data_key_id = self.client_encryption.create_data_key("local")
         self.assertEqual(4, data_key_id.subtype)

test/test_gridfs_bucket.py

@@ -529,6 +529,8 @@ def test_gridfs_secondary_lazy(self):
 # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#6-gridfs---upload
 class TestGridFsCSOT(IntegrationTest):
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#uploads-via-openuploadstream-can-be-timed-out
+    @client_context.require_failCommand_fail_point
+    @client_context.require_version_min(4, 4, -1)
     def test_06_01_uploads_via_open_upload_stream_can_be_timed_out(self):
         self.client.db.fs.files.drop()
         self.client.db.fs.chunks.drop()
@@ -547,6 +549,8 @@ def test_06_01_uploads_via_open_upload_stream_can_be_timed_out(self):
                 upload_stream.close()
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#aborting-an-upload-stream-can-be-timed-out
+    @client_context.require_failCommand_fail_point
+    @client_context.require_version_min(4, 4, -1)
     def test_06_02_aborting_an_upload_stream_can_be_timed_out(self):
         self.client.db.fs.files.drop()
         self.client.db.fs.chunks.drop()
@@ -565,6 +569,8 @@ def test_06_02_aborting_an_upload_stream_can_be_timed_out(self):
                 upload_stream.abort()
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#7-gridfs---download
+    @client_context.require_failCommand_fail_point
+    @client_context.require_version_min(4, 4, -1)
     def test_07_gridfs_download_csot(self):
         self.client.db.fs.files.drop()
         self.client.db.fs.chunks.drop()

test/test_server_selection.py

@@ -204,6 +204,7 @@ def test_server_selector_bypassed(self):
 # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#8-server-selection
 class TestServerSelectionCSOT(IntegrationTest):
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#serverselectiontimeoutms-honored-if-timeoutms-is-not-set
+    @client_context.require_version_min(4, 4, -1)
     def test_08_01_server_selection_timeoutMS_honored(self):
         client = self.single_client("mongodb://invalid/?serverSelectionTimeoutMS=10")
         with self.assertRaises(ServerSelectionTimeoutError):
@@ -215,6 +216,7 @@ def test_08_01_server_selection_timeoutMS_honored(self):
         self.assertLessEqual(start - end, 15)
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#timeoutms-honored-for-server-selection-if-its-lower-than-serverselectiontimeoutms
+    @client_context.require_version_min(4, 4, -1)
     def test_08_02_timeoutMS_honored_for_server_selection_if_lower(self):
         client = self.single_client("mongodb://invalid/?timeoutMS=10&serverSelectionTimeoutMS=20")
         with self.assertRaises(ServerSelectionTimeoutError):
@@ -225,6 +227,7 @@ def test_08_02_timeoutMS_honored_for_server_selection_if_lower(self):
         self.assertLessEqual(start - end, 15)
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#serverselectiontimeoutms-honored-for-server-selection-if-its-lower-than-timeoutms
+    @client_context.require_version_min(4, 4, -1)
     def test_08_03_serverselectiontimeoutms_honored_for_server_selection_if_lower(self):
         client = self.single_client("mongodb://invalid/?timeoutMS=20&serverSelectionTimeoutMS=10")
         with self.assertRaises(ServerSelectionTimeoutError):
@@ -236,6 +239,7 @@ def test_08_03_serverselectiontimeoutms_honored_for_server_selection_if_lower(se
         self.assertLessEqual(start - end, 15)
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#serverselectiontimeoutms-honored-for-server-selection-if-timeoutms0
+    @client_context.require_version_min(4, 4, -1)
     def test_08_04_serverselectiontimeoutms_honored_for_server_selection_if_zero_timeoutms(self):
         client = self.single_client("mongodb://invalid/?timeoutMS=0&serverSelectionTimeoutMS=10")
         with self.assertRaises(ServerSelectionTimeoutError):
@@ -248,6 +252,8 @@ def test_08_04_serverselectiontimeoutms_honored_for_server_selection_if_zero_tim
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#timeoutms-honored-for-connection-handshake-commands-if-its-lower-than-serverselectiontimeoutms
     @client_context.require_auth
+    @client_context.require_version_min(4, 4, -1)
+    @client_context.require_failCommand_fail_point
     def test_08_05_timeoutms_honored_for_handshake_if_lower(self):
         with self.fail_point(
             {
@@ -270,6 +276,8 @@ def test_08_05_timeoutms_honored_for_handshake_if_lower(self):
 
     # https://github.com/mongodb/specifications/blob/master/source/client-side-operations-timeout/tests/README.md#serverselectiontimeoutms-honored-for-connection-handshake-commands-if-its-lower-than-timeoutms
     @client_context.require_auth
+    @client_context.require_version_min(4, 4, -1)
+    @client_context.require_failCommand_fail_point
     def test_08_06_serverSelectionTimeoutMS_honored_for_handshake_if_lower(self):
         with self.fail_point(
             {