more test cleanup

Author: blink1073

test/discovery_and_monitoring/unified/backoff-heartbeat-failure.json

@@ -56,7 +56,7 @@
                   ],
                   "uriOptions": {
                     "retryWrites": false,
-                    "heartbeatFrequencyMS": 5000,
+                    "heartbeatFrequencyMS": 10000,
                     "appname": "heartbeatBackoffFailTest"
                   }
                 }

test/discovery_and_monitoring/unified/backoff-network-error-fail.json

@@ -38,6 +38,17 @@
     {
       "description": "Backoff and fail after network connection errors during connection establishment",
       "operations": [
+          {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "setupClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": "off"
+            }
+          }
+        },
         {
           "name": "createEntities",
           "object": "testRunner",
@@ -141,7 +152,17 @@
     {
       "description": "Backoff and clear the pool after network failures followed by server error",
       "operations": [
-        
+          {
+          "name": "failPoint",
+          "object": "testRunner",
+          "arguments": {
+            "client": "setupClient",
+            "failPoint": {
+              "configureFailPoint": "failCommand",
+              "mode": "off"
+            }
+          }
+        },
         {
           "name": "createEntities",
           "object": "testRunner",

test/load_balancer/sdam-error-handling.json

@@ -41,7 +41,10 @@
           "connectionCheckOutFailedEvent",
           "connectionCheckedInEvent",
           "connectionClosedEvent",
-          "poolClearedEvent"
+          "poolClearedEvent",
+          "poolBackoffEvent",
+          "serverHeartbeatSucceededEvent",
+          "serverHeartbeatFailedEvent"
         ]
       }
     },
@@ -260,13 +263,24 @@
       ]
     },
     {
-      "description": "errors during the initial connection hello are ignored",
+      "description": "errors during the initial connection hello trigger backoff",
       "runOnRequirements": [
         {
           "minServerVersion": "4.4.7"
         }
       ],
       "operations": [
+        {
+          "name": "waitForEvent",
+          "object": "testRunner",
+          "arguments": {
+            "client": "singleClient",
+            "event": {
+              "serverHeartbeatSucceededEvent": {}
+            },
+            "count": 1
+          }
+        },
         {
           "name": "failPoint",
           "object": "testRunner",
@@ -295,9 +309,17 @@
             "document": {
               "x": 1
             }
-          },
-          "expectError": {
-            "isClientError": true
+          }
+        },
+        {
+          "name": "waitForEvent",
+          "object": "testRunner",
+          "arguments": {
+            "client": "client",
+            "event": {
+              "poolBackoffEvent": {}
+            },
+            "count": 1
           }
         }
       ],
@@ -318,6 +340,17 @@
               "connectionCheckOutFailedEvent": {
                 "reason": "connectionError"
               }
+            },
+            {
+              "poolBackoffEvent": {
+                "attempt": 1
+              }
+            },
+            {
+              "connectionCheckedOutEvent": {}
+            },
+            {
+              "connectionCheckedInEvent": {}
             }
           ]
         }