[Spec Resync] 07-09-2026

test/asynchronous/test_srv_polling.py

@@ -21,7 +21,6 @@
 import time
 from typing import Any
 
-from test.asynchronous.utils import flaky
 from test.utils_shared import FunctionCallRecorder
 
 sys.path[0:0] = [""]
@@ -226,7 +225,6 @@ def response_callback(*args):
 
             await self.run_scenario(response_callback, False)
 
-    @flaky(reason="PYTHON-5500", max_runs=3)
     async def test_dns_failures_logging(self):
         from dns import exception
 
@@ -237,6 +235,11 @@ def response_callback(*args):
 
             await self.run_scenario(response_callback, False)
 
+            await async_wait_until(
+                lambda: any("SRV monitor check failed" in r.getMessage() for r in cm.records),
+                "log the SRV monitor check failure",
+            )
+
         srv_failure_logs = [r for r in cm.records if "SRV monitor check failed" in r.getMessage()]
         self.assertEqual(len(srv_failure_logs), 1)
 
@@ -270,14 +273,12 @@ def final_callback():
             # Nodelist should reflect new valid DNS resolver response.
             await self.assert_nodelist_change(response_final, client)
 
-    @flaky(reason="PYTHON-5315")
     async def test_recover_from_initially_empty_seedlist(self):
         def empty_seedlist():
             return []
 
         await self._test_recover_from_initial(empty_seedlist)
 
-    @flaky(reason="PYTHON-5315")
     async def test_recover_from_initially_erroring_seedlist(self):
         def erroring_seedlist():
             raise ConfigurationError

test/client-side-encryption/etc/data/encryptedFields-substring-ci-di.json

@@ -11,15 +11,15 @@
       "bsonType": "string",
       "queries": [
         {
-          "queryType": "substringPreview",
+          "queryType": "substring",
           "strMaxLength": {
             "$numberInt": "10"
           },
           "strMinQueryLength": {
             "$numberInt": "2"
           },
           "strMaxQueryLength": {
-            "$numberInt": "10"
+            "$numberInt": "6"
           },
           "contention": 0,
           "caseSensitive": false,
@@ -28,4 +28,4 @@
       ]
     }
   ]
-}
+}

test/client-side-encryption/etc/data/encryptedFields-substring-preview.json

@@ -0,0 +1,33 @@
+{
+  "fields": [
+    {
+            "keyId": {
+                "$binary": {
+                    "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+                    "subType": "04"
+                }
+            },
+            "path": "encryptedText",
+            "bsonType": "string",
+            "queries": [
+                {
+                    "queryType": "substringPreview",
+                    "strMaxLength": {
+                        "$numberInt": "10"
+                    },
+                    "strMinQueryLength": {
+                        "$numberInt": "2"
+                    },
+                    "strMaxQueryLength": {
+                        "$numberInt": "6"
+                    },
+                    "contention": {
+                        "$numberLong": "0"
+                    },
+                    "caseSensitive": true,
+                    "diacriticSensitive": true
+                }
+            ]
+        }
+  ]
+}

test/client-side-encryption/etc/data/encryptedFields-substring.json

@@ -1,6 +1,6 @@
 {
-  "fields": [
-    {
+    "fields": [
+        {
             "keyId": {
                 "$binary": {
                     "base64": "EjRWeBI0mHYSNBI0VniQEg==",
@@ -11,15 +11,15 @@
             "bsonType": "string",
             "queries": [
                 {
-                    "queryType": "substringPreview",
+                    "queryType": "substring",
                     "strMaxLength": {
                         "$numberInt": "10"
                     },
                     "strMinQueryLength": {
                         "$numberInt": "2"
                     },
                     "strMaxQueryLength": {
-                        "$numberInt": "10"
+                        "$numberInt": "6"
                     },
                     "contention": {
                         "$numberLong": "0"
@@ -29,5 +29,5 @@
                 }
             ]
         }
-  ]
+    ]
 }