From 6380f5d336691260aed26691b701fb81849ed763 Mon Sep 17 00:00:00 2001
From: Shane Harvey <shnhrv@gmail.com>
Date: Fri, 2 Aug 2024 12:03:11 -0700
Subject: [PATCH 1/2] PYTHON-4605 Test serverMonitoringMode=poll waits after a
 successful heartbeat

---
 .../unified/serverMonitoringMode.json         | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/test/discovery_and_monitoring/unified/serverMonitoringMode.json b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
index 7d681b4f9e..5b490f0f50 100644
--- a/test/discovery_and_monitoring/unified/serverMonitoringMode.json
+++ b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
@@ -444,6 +444,70 @@
           ]
         }
       ]
+    },
+    {
+      "description": "poll waits after successful heartbeat",
+      "operations": [
+        {
+          "name": "createEntities",
+          "object": "testRunner",
+          "arguments": {
+            "entities": [
+              {
+                "client": {
+                  "id": "client",
+                  "uriOptions": {
+                    "serverMonitoringMode": "poll",
+                    "heartbeatFrequencyMS": 1000000
+                  },
+                  "useMultipleMongoses": false,
+                  "observeEvents": [
+                    "serverHeartbeatStartedEvent",
+                    "serverHeartbeatSucceededEvent",
+                    "serverHeartbeatFailedEvent"
+                  ]
+                }
+              },
+              {
+                "database": {
+                  "id": "db",
+                  "client": "client",
+                  "databaseName": "sdam-tests"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "name": "waitForEvent",
+          "object": "testRunner",
+          "arguments": {
+            "client": "client",
+            "event": {
+              "serverHeartbeatSucceededEvent": {}
+            },
+            "count": 1
+          }
+        },
+        {
+          "name": "wait",
+          "object": "testRunner",
+          "arguments": {
+            "ms": 500
+          }
+        },
+        {
+          "name": "assertEventCount",
+          "object": "testRunner",
+          "arguments": {
+            "client": "client",
+            "event": {
+              "serverHeartbeatStartedEvent": {}
+            },
+            "count": 1
+          }
+        }
+      ]
     }
   ]
 }

From 45d6c2a30086f2251381c8c667c229aef04ed536 Mon Sep 17 00:00:00 2001
From: Shane Harvey <shnhrv@gmail.com>
Date: Mon, 5 Aug 2024 11:43:53 -0700
Subject: [PATCH 2/2] PYTHON-4605 resync test

---
 .../discovery_and_monitoring/unified/serverMonitoringMode.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/discovery_and_monitoring/unified/serverMonitoringMode.json b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
index 5b490f0f50..4b492f7d85 100644
--- a/test/discovery_and_monitoring/unified/serverMonitoringMode.json
+++ b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
@@ -463,8 +463,7 @@
                   "useMultipleMongoses": false,
                   "observeEvents": [
                     "serverHeartbeatStartedEvent",
-                    "serverHeartbeatSucceededEvent",
-                    "serverHeartbeatFailedEvent"
+                    "serverHeartbeatSucceededEvent"
                   ]
                 }
               },