more test cleanup

Author: blink1073

test/asynchronous/unified_format.py

@@ -1397,9 +1397,10 @@ async def run_scenario(self, spec, uri=None):
         for reason, flaky_test in flaky_tests:
             if re.match(flaky_test.lower(), self.id().lower()) is not None:
                 func_name = self.id()
-                options = dict(reason=reason, reset_func=self.asyncSetUp, func_name=func_name)
+                options = dict(
+                    reason=reason, reset_func=self.asyncSetUp, func_name=func_name, max_runs=3
+                )
                 if "csot" in func_name.lower():
-                    options["max_runs"] = 3
                     options["affects_cpython_linux"] = True
                 decorator = flaky(**options)
                 await decorator(self._run_scenario)(spec, uri)

test/load_balancer/sdam-error-handling.json

@@ -42,9 +42,7 @@
           "connectionCheckedInEvent",
           "connectionClosedEvent",
           "poolClearedEvent",
-          "poolBackoffEvent",
-          "serverHeartbeatSucceededEvent",
-          "serverHeartbeatFailedEvent"
+          "poolBackoffEvent"
         ]
       }
     },
@@ -270,17 +268,6 @@
         }
       ],
       "operations": [
-        {
-          "name": "waitForEvent",
-          "object": "testRunner",
-          "arguments": {
-            "client": "singleClient",
-            "event": {
-              "serverHeartbeatSucceededEvent": {}
-            },
-            "count": 1
-          }
-        },
         {
           "name": "failPoint",
           "object": "testRunner",

test/unified_format.py

@@ -1384,9 +1384,10 @@ def run_scenario(self, spec, uri=None):
         for reason, flaky_test in flaky_tests:
             if re.match(flaky_test.lower(), self.id().lower()) is not None:
                 func_name = self.id()
-                options = dict(reason=reason, reset_func=self.setUp, func_name=func_name)
+                options = dict(
+                    reason=reason, reset_func=self.setUp, func_name=func_name, max_runs=3
+                )
                 if "csot" in func_name.lower():
-                    options["max_runs"] = 3
                     options["affects_cpython_linux"] = True
                 decorator = flaky(**options)
                 decorator(self._run_scenario)(spec, uri)