From 0f547df53eccfc3b4de6157269fdf59259ae1c77 Mon Sep 17 00:00:00 2001
From: Noah Stapp <noah.stapp@mongodb.com>
Date: Wed, 23 Sep 2026 13:14:04 -0400
Subject: [PATCH] PYTHON-6122 Address flakiness in command logging, retryable
 reads, and retryable writes unified tests for retryable handshake errors

---
 test/command_logging/redacted-commands.json   |  6 ++++
 .../unified/handshakeError.json               | 35 +++++++++++++++++++
 .../unified/handshakeError.json               | 23 ++++++++++++
 3 files changed, 64 insertions(+)

diff --git a/test/command_logging/redacted-commands.json b/test/command_logging/redacted-commands.json
index 362c1b9161..5b3d3a8f92 100644
--- a/test/command_logging/redacted-commands.json
+++ b/test/command_logging/redacted-commands.json
@@ -12,6 +12,9 @@
       "client": {
         "id": "client",
         "useMultipleMongoses": false,
+        "uriOptions": {
+          "appname": "commandLoggingRedactionTest"
+        },
         "observeLogMessages": {
           "command": "debug"
         }
@@ -101,6 +104,7 @@
                 "failCommands": [
                   "authenticate"
                 ],
+                "appName": "commandLoggingRedactionTest",
                 "closeConnection": true
               }
             }
@@ -222,6 +226,7 @@
                 "failCommands": [
                   "saslStart"
                 ],
+                "appName": "commandLoggingRedactionTest",
                 "closeConnection": true
               }
             }
@@ -343,6 +348,7 @@
                 "failCommands": [
                   "saslContinue"
                 ],
+                "appName": "commandLoggingRedactionTest",
                 "closeConnection": true
               }
             }
diff --git a/test/retryable_reads/unified/handshakeError.json b/test/retryable_reads/unified/handshakeError.json
index 2921d8a954..225b83affc 100644
--- a/test/retryable_reads/unified/handshakeError.json
+++ b/test/retryable_reads/unified/handshakeError.json
@@ -17,6 +17,9 @@
       "client": {
         "id": "client",
         "useMultipleMongoses": false,
+        "uriOptions": {
+          "appname": "retryableReadHandshakeTest"
+        },
         "observeEvents": [
           "connectionCheckOutStartedEvent",
           "commandStartedEvent",
@@ -79,6 +82,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -172,6 +176,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -265,6 +270,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -355,6 +361,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -450,6 +457,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -549,6 +557,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -648,6 +657,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -753,6 +763,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -853,6 +864,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -946,6 +958,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1039,6 +1052,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1132,6 +1146,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1230,6 +1245,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1329,6 +1345,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1423,6 +1440,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1516,6 +1534,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1609,6 +1628,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1702,6 +1722,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1795,6 +1816,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1885,6 +1907,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1975,6 +1998,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -2069,6 +2093,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -2163,6 +2188,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -2256,6 +2282,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -2349,6 +2376,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -2442,6 +2470,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -2535,6 +2564,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -2625,6 +2655,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -2715,6 +2746,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -2805,6 +2837,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -2900,6 +2933,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -2999,6 +3033,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableReadHandshakeTest",
                 "closeConnection": true
               }
             }
diff --git a/test/retryable_writes/unified/handshakeError.json b/test/retryable_writes/unified/handshakeError.json
index 93cb2e849e..90be1f6286 100644
--- a/test/retryable_writes/unified/handshakeError.json
+++ b/test/retryable_writes/unified/handshakeError.json
@@ -17,6 +17,9 @@
       "client": {
         "id": "client",
         "useMultipleMongoses": false,
+        "uriOptions": {
+          "appname": "retryableWriteHandshakeTest"
+        },
         "observeEvents": [
           "connectionCheckOutStartedEvent",
           "commandStartedEvent",
@@ -77,6 +80,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -186,6 +190,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -289,6 +294,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -385,6 +391,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -481,6 +488,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -579,6 +587,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -677,6 +686,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -770,6 +780,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -863,6 +874,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -959,6 +971,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1055,6 +1068,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1153,6 +1167,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1251,6 +1266,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1344,6 +1360,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1437,6 +1454,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1533,6 +1551,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1629,6 +1648,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1727,6 +1747,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1825,6 +1846,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }
@@ -1927,6 +1949,7 @@
                   "ping",
                   "saslContinue"
                 ],
+                "appName": "retryableWriteHandshakeTest",
                 "closeConnection": true
               }
             }