fix api require version tests

Author: blink1073

test/__init__.py

@@ -1138,10 +1138,6 @@ def rs_or_single_client(self, h: Any = None, p: Any = None, **kwargs: Any) -> Mo
         return self._async_mongo_client(h, p, **kwargs)
 
     def simple_client(self, h: Any = None, p: Any = None, **kwargs: Any) -> MongoClient:
-        client_options: dict = client_context.default_client_options.copy()
-        kwargs = kwargs.copy()
-        for key, value in client_options.items():
-            kwargs.setdefault(key, value)
         if not h and not p:
             client = MongoClient(**kwargs)
         else:
@@ -1151,10 +1147,6 @@ def simple_client(self, h: Any = None, p: Any = None, **kwargs: Any) -> MongoCli
 
     @classmethod
     def unmanaged_simple_client(cls, h: Any = None, p: Any = None, **kwargs: Any) -> MongoClient:
-        client_options: dict = client_context.default_client_options.copy()
-        kwargs = kwargs.copy()
-        for key, value in client_options.items():
-            kwargs.setdefault(key, value)
         if not h and not p:
             client = MongoClient(**kwargs)
         else:

test/asynchronous/__init__.py

@@ -1154,10 +1154,6 @@ async def async_rs_or_single_client(
         return await self._async_mongo_client(h, p, **kwargs)
 
     def simple_client(self, h: Any = None, p: Any = None, **kwargs: Any) -> AsyncMongoClient:
-        client_options: dict = async_client_context.default_client_options.copy()
-        kwargs = kwargs.copy()
-        for key, value in client_options.items():
-            kwargs.setdefault(key, value)
         if not h and not p:
             client = AsyncMongoClient(**kwargs)
         else:
@@ -1169,10 +1165,6 @@ def simple_client(self, h: Any = None, p: Any = None, **kwargs: Any) -> AsyncMon
     def unmanaged_simple_client(
         cls, h: Any = None, p: Any = None, **kwargs: Any
     ) -> AsyncMongoClient:
-        client_options: dict = async_client_context.default_client_options.copy()
-        kwargs = kwargs.copy()
-        for key, value in client_options.items():
-            kwargs.setdefault(key, value)
         if not h and not p:
             client = AsyncMongoClient(**kwargs)
         else:

test/asynchronous/test_ssl.py

@@ -171,6 +171,7 @@ async def test_simple_ssl(self):
         await self.assertClientWorks(self.client)
 
     @async_client_context.require_tlsCertificateKeyFile
+    @async_client_context.require_no_api_version
     @ignore_deprecations
     async def test_tlsCertificateKeyFilePassword(self):
         # Expects the server to be running with server.pem and ca.pem
@@ -376,6 +377,7 @@ async def test_cert_ssl_validation_hostname_matching(self):
             )
 
     @async_client_context.require_tlsCertificateKeyFile
+    @async_client_context.require_no_api_version
     @ignore_deprecations
     async def test_tlsCRLFile_support(self):
         if not hasattr(ssl, "VERIFY_CRL_CHECK_LEAF") or _ssl.IS_PYOPENSSL:
@@ -531,6 +533,7 @@ def test_wincertstore(self):
 
     @async_client_context.require_auth
     @async_client_context.require_tlsCertificateKeyFile
+    @async_client_context.require_no_api_version
     @ignore_deprecations
     async def test_mongodb_x509_auth(self):
         host, port = await async_client_context.host, await async_client_context.port
@@ -640,6 +643,7 @@ async def test_mongodb_x509_auth(self):
             self.fail("Invalid certificate accepted.")
 
     @async_client_context.require_tlsCertificateKeyFile
+    @async_client_context.require_no_api_version
     @ignore_deprecations
     async def test_connect_with_ca_bundle(self):
         def remove(path):

test/test_ssl.py

@@ -171,6 +171,7 @@ def test_simple_ssl(self):
         self.assertClientWorks(self.client)
 
     @client_context.require_tlsCertificateKeyFile
+    @client_context.require_no_api_version
     @ignore_deprecations
     def test_tlsCertificateKeyFilePassword(self):
         # Expects the server to be running with server.pem and ca.pem
@@ -376,6 +377,7 @@ def test_cert_ssl_validation_hostname_matching(self):
             )
 
     @client_context.require_tlsCertificateKeyFile
+    @client_context.require_no_api_version
     @ignore_deprecations
     def test_tlsCRLFile_support(self):
         if not hasattr(ssl, "VERIFY_CRL_CHECK_LEAF") or _ssl.IS_PYOPENSSL:
@@ -531,6 +533,7 @@ def test_wincertstore(self):
 
     @client_context.require_auth
     @client_context.require_tlsCertificateKeyFile
+    @client_context.require_no_api_version
     @ignore_deprecations
     def test_mongodb_x509_auth(self):
         host, port = client_context.host, client_context.port
@@ -640,6 +643,7 @@ def test_mongodb_x509_auth(self):
             self.fail("Invalid certificate accepted.")
 
     @client_context.require_tlsCertificateKeyFile
+    @client_context.require_no_api_version
     @ignore_deprecations
     def test_connect_with_ca_bundle(self):
         def remove(path):