PYTHON-2453 Fix various test failures with requireApiVersion=1

Author: ShaneHarvey

test/__init__.py

@@ -758,6 +758,8 @@ def sanitize_cmd(cmd):
     cp.pop('$db', None)
     cp.pop('$readPreference', None)
     cp.pop('lsid', None)
+    # Versioned api parameters
+    cp.pop('apiVersion', None)
     # OP_MSG encoding may move the payload type one field to the
     # end of the command. Do the same here.
     name = next(iter(cp))

test/test_pooling.py

@@ -176,6 +176,7 @@ def create_pool(
         pool_options = client_context.client._topology_settings.pool_options
         kwargs['ssl_context'] = pool_options.ssl_context
         kwargs['ssl_match_hostname'] = pool_options.ssl_match_hostname
+        kwargs['server_api'] = pool_options.server_api
         return Pool(pair, PoolOptions(*args, **kwargs))
 
 

test/test_versioned_api.py

@@ -22,7 +22,7 @@
 
 from test import client_context, IntegrationTest, unittest
 from test.unified_format import generate_test_classes
-from test.utils import EventListener, rs_or_single_client
+from test.utils import OvertCommandListener, rs_or_single_client
 
 
 TEST_PATH = os.path.join(
@@ -74,7 +74,7 @@ def assertServerApiOnlyInFirstCommand(self, events):
             self.assertNoServerApi(event)
 
     def test_command_options(self):
-        listener = EventListener()
+        listener = OvertCommandListener()
         client = rs_or_single_client(server_api=ServerApi('1'),
                                      event_listeners=[listener])
         self.addCleanup(client.close)
@@ -91,7 +91,7 @@ def test_command_options(self):
 
     @client_context.require_transactions
     def test_command_options_txn(self):
-        listener = EventListener()
+        listener = OvertCommandListener()
         client = rs_or_single_client(server_api=ServerApi('1'),
                                      event_listeners=[listener])
         self.addCleanup(client.close)