Filter out killCursors in some monitoring tests

Author: behackett

test/test_command_monitoring_spec.py

@@ -49,6 +49,7 @@ class TestAllScenarios(unittest.TestCase):
     @client_context.require_connection
     def setUpClass(cls):
         cls.listener = EventListener()
+        cls.listener.add_command_filter('killCursors')
         cls.saved_listeners = monitoring._LISTENERS
         monitoring._LISTENERS = monitoring._Listeners([])
         cls.client = single_client(event_listeners=[cls.listener])
@@ -101,10 +102,11 @@ def run_scenario(self):
                 except OperationFailure:
                     pass
             elif name == 'find':
-                # XXX: Skip killCursors test when using the find command.
-                if (client_context.version.at_least(3, 1, 1) and
-                        'limit' in args):
-                    continue
+                if 'limit' in args:
+                    # XXX: Skip killCursors test when using the find command.
+                    if client_context.version.at_least(3, 1, 1):
+                        continue
+                    self.listener.remove_command_filter('killCursors')
                 if 'sort' in args:
                     args['sort'] = list(args['sort'].items())
                 try:
@@ -118,6 +120,7 @@ def run_scenario(self):
                     wait_until(
                         lambda: started[-1].command_name == 'killCursors',
                         "publish a start event for killCursors.")
+                    self.listener.add_command_filter('killCursors')
             else:
                 try:
                     getattr(coll, name)(**args)

test/test_cursor.py

@@ -226,6 +226,7 @@ def test_max_await_time_ms(self):
         self.assertEqual(90, cursor._Cursor__max_await_time_ms)
 
         listener = EventListener()
+        listener.add_command_filter('killCursors')
         saved_listeners = monitoring._LISTENERS
         monitoring._LISTENERS = monitoring._Listeners([])
         coll = single_client(

test/utils.py

@@ -43,15 +43,25 @@ class EventListener(monitoring.CommandListener):
 
     def __init__(self):
         self.results = defaultdict(list)
+        self.filters = set()
+
+    def add_command_filter(self, command_name):
+        self.filters.add(command_name)
+
+    def remove_command_filter(self, command_name):
+        self.filters.remove(command_name)
 
     def started(self, event):
-        self.results['started'].append(event)
+        if event.command_name not in self.filters:
+            self.results['started'].append(event)
 
     def succeeded(self, event):
-        self.results['succeeded'].append(event)
+        if event.command_name not in self.filters:
+            self.results['succeeded'].append(event)
 
     def failed(self, event):
-        self.results['failed'].append(event)
+        if event.command_name not in self.filters:
+            self.results['failed'].append(event)
 
 
 def _connection_string_noauth(h, p):