add error label check and add runOnRequirement

blink1073 · blink1073 · commit 1e6973b41b61 · 2025-10-31T15:58:27.000-05:00
diff --git a/test/asynchronous/unified_format.py b/test/asynchronous/unified_format.py
@@ -157,13 +157,19 @@ async def is_run_on_requirement_satisfied(requirement):
         min_version_satisfied = Version.from_string("4.2") <= server_version
         csfle_satisfied = _HAVE_PYMONGOCRYPT and min_version_satisfied
 
+    pool_backoff_statisfied = True
+    req_pool_backoff = requirement.get("supportsPoolBackoff")
+    if req_pool_backoff is False:
+        pool_backoff_statisfied = False
+
     return (
         topology_satisfied
         and min_version_satisfied
         and max_version_satisfied
         and params_satisfied
         and auth_satisfied
         and csfle_satisfied
+        and pool_backoff_statisfied
     )
 
 
diff --git a/test/discovery_and_monitoring/unified/backoff-heartbeat-failure.json b/test/discovery_and_monitoring/unified/backoff-heartbeat-failure.json
@@ -5,6 +5,7 @@
     {
       "minServerVersion": "4.4",
       "serverless": "forbid",
+      "supportsPoolBackoff": true,
       "topologies": [
         "single",
         "replicaset",
@@ -123,7 +124,11 @@
             ]
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorLabelsContain": [
+              "SystemOverloadedError",
+              "RetryableError"
+            ]
           }
         },
         {
diff --git a/test/discovery_and_monitoring/unified/backoff-heartbeat-success.json b/test/discovery_and_monitoring/unified/backoff-heartbeat-success.json
@@ -5,6 +5,7 @@
     {
       "minServerVersion": "4.4",
       "serverless": "forbid",
+      "supportsPoolBackoff": true,
       "topologies": [
         "single",
         "replicaset",
@@ -123,7 +124,11 @@
             ]
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorLabelsContain": [
+              "SystemOverloadedError",
+              "RetryableError"
+            ]
           }
         },
         {
diff --git a/test/discovery_and_monitoring/unified/backoff-network-error-fail.json b/test/discovery_and_monitoring/unified/backoff-network-error-fail.json
@@ -5,6 +5,7 @@
     {
       "minServerVersion": "4.4",
       "serverless": "forbid",
+      "supportsPoolBackoff": true,
       "topologies": [
         "single",
         "replicaset",
@@ -123,7 +124,11 @@
             ]
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorLabelsContain": [
+              "SystemOverloadedError",
+              "RetryableError"
+            ]
           }
         },
         {
@@ -244,7 +249,11 @@
             ]
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorLabelsContain": [
+              "SystemOverloadedError",
+              "RetryableError"
+            ]
           }
         },
         {
diff --git a/test/discovery_and_monitoring/unified/backoff-network-error.json b/test/discovery_and_monitoring/unified/backoff-network-error.json
@@ -5,6 +5,7 @@
     {
       "minServerVersion": "4.4",
       "serverless": "forbid",
+      "supportsPoolBackoff": true,
       "topologies": [
         "single",
         "replicaset",
@@ -127,7 +128,11 @@
             ]
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorLabelsContain": [
+              "SystemOverloadedError",
+              "RetryableError"
+            ]
           }
         },
         {
diff --git a/test/discovery_and_monitoring/unified/backoff-network-timeout-error.json b/test/discovery_and_monitoring/unified/backoff-network-timeout-error.json
@@ -5,6 +5,7 @@
     {
       "minServerVersion": "4.4",
       "serverless": "forbid",
+      "supportsPoolBackoff": true,
       "topologies": [
         "single",
         "replicaset",
@@ -127,7 +128,11 @@
             ]
           },
           "expectError": {
-            "isError": true
+            "isError": true,
+            "errorLabelsContain": [
+              "SystemOverloadedError",
+              "RetryableError"
+            ]
           }
         },
         {
diff --git a/test/unified_format.py b/test/unified_format.py
@@ -156,13 +156,19 @@ def is_run_on_requirement_satisfied(requirement):
         min_version_satisfied = Version.from_string("4.2") <= server_version
         csfle_satisfied = _HAVE_PYMONGOCRYPT and min_version_satisfied
 
+    pool_backoff_statisfied = True
+    req_pool_backoff = requirement.get("supportsPoolBackoff")
+    if req_pool_backoff is False:
+        pool_backoff_statisfied = False
+
     return (
         topology_satisfied
         and min_version_satisfied
         and max_version_satisfied
         and params_satisfied
         and auth_satisfied
         and csfle_satisfied
+        and pool_backoff_statisfied
     )
 
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`{`
`6`	`6`	`"minServerVersion": "4.4",`
`7`	`7`	`"serverless": "forbid",`
	`8`	`+ "supportsPoolBackoff": true,`
`8`	`9`	`"topologies": [`
`9`	`10`	`"single",`
`10`	`11`	`"replicaset",`
`@@ -123,7 +124,11 @@`
`123`	`124`	`]`
`124`	`125`	`},`
`125`	`126`	`"expectError": {`
`126`		`- "isError": true`
	`127`	`+ "isError": true,`
	`128`	`+ "errorLabelsContain": [`
	`129`	`+ "SystemOverloadedError",`
	`130`	`+ "RetryableError"`
	`131`	`+ ]`
`127`	`132`	`}`
`128`	`133`	`},`
`129`	`134`	`{`