undo changes to specs

blink1073 · blink1073 · commit 91f950e35fa9 · 2025-11-10T07:44:06.000-06:00
diff --git a/test/connection_logging/connection-logging.json b/test/connection_logging/connection-logging.json
@@ -331,9 +331,7 @@
                   "uriOptions": {
                     "retryReads": false,
                     "appname": "clientAppName",
-                    "heartbeatFrequencyMS": 10000,
-                    "socketTimeoutMS": 500,
-                    "connectTimeoutMS": 500
+                    "heartbeatFrequencyMS": 10000
                   },
                   "observeLogMessages": {
                     "connection": "debug"
@@ -357,9 +355,7 @@
                 "failCommands": [
                   "saslContinue"
                 ],
-                "closeConnection": false,
-                "blockConnection": true,
-                "blockTimeMS": 1000,
+                "closeConnection": true,
                 "appName": "clientAppName"
               }
             }
@@ -450,6 +446,22 @@
                 }
               }
             },
+            {
+              "level": "debug",
+              "component": "connection",
+              "data": {
+                "message": "Connection pool cleared",
+                "serverHost": {
+                  "$$type": "string"
+                },
+                "serverPort": {
+                  "$$type": [
+                    "int",
+                    "long"
+                  ]
+                }
+              }
+            },
             {
               "level": "debug",
               "component": "connection",
@@ -502,22 +514,6 @@
                   ]
                 }
               }
-            },
-            {
-              "level": "debug",
-              "component": "connection",
-              "data": {
-                "message": "Connection pool cleared",
-                "serverHost": {
-                  "$$type": "string"
-                },
-                "serverPort": {
-                  "$$type": [
-                    "int",
-                    "long"
-                  ]
-                }
-              }
             }
           ]
         }
diff --git a/test/connection_monitoring/pool-create-min-size-error.json b/test/connection_monitoring/pool-create-min-size-error.json
@@ -9,23 +9,21 @@
   ],
   "failPoint": {
     "configureFailPoint": "failCommand",
-    "mode": "alwaysOn",
+    "mode": {
+      "times": 50
+    },
     "data": {
       "failCommands": [
         "isMaster",
         "hello"
       ],
-      "closeConnection": false,
-      "blockConnection": true,
-      "blockTimeMS": 1000,
+      "closeConnection": true,
       "appName": "poolCreateMinSizeErrorTest"
     }
   },
   "poolOptions": {
     "minPoolSize": 1,
     "backgroundThreadIntervalMS": 50,
-    "socketTimeoutMS": 500,
-    "connectTimeoutMS": 500,
     "appName": "poolCreateMinSizeErrorTest"
   },
   "operations": [
@@ -51,15 +49,15 @@
       "type": "ConnectionCreated",
       "address": 42
     },
+    {
+      "type": "ConnectionPoolCleared",
+      "address": 42
+    },
     {
       "type": "ConnectionClosed",
       "address": 42,
       "connectionId": 42,
       "reason": "error"
-    },
-    {
-      "type": "ConnectionPoolCleared",
-      "address": 42
     }
   ],
   "ignore": [
diff --git a/test/discovery_and_monitoring/unified/auth-network-error.json b/test/discovery_and_monitoring/unified/auth-network-error.json
@@ -53,9 +53,7 @@
                 "failCommands": [
                   "saslContinue"
                 ],
-                "closeConnection": false,
-                "blockConnection": true,
-                "blockTimeMS": 1000,
+                "closeConnection": true,
                 "appName": "authNetworkErrorTest"
               }
             }
@@ -77,8 +75,6 @@
                   ],
                   "uriOptions": {
                     "retryWrites": false,
-                    "socketTimeoutMS": 500,
-                    "connectTimeoutMS": 500,
                     "appname": "authNetworkErrorTest"
                   }
                 }
diff --git a/test/load_balancer/sdam-error-handling.json b/test/load_balancer/sdam-error-handling.json
@@ -32,8 +32,6 @@
         "useMultipleMongoses": false,
         "uriOptions": {
           "appname": "lbSDAMErrorTestClient",
-          "socketTimeoutMS": 500,
-          "connectTimeoutMS": 500,
           "retryWrites": false
         },
         "observeEvents": [
@@ -66,9 +64,7 @@
         "id": "multiClient",
         "useMultipleMongoses": true,
         "uriOptions": {
-          "retryWrites": false,
-           "socketTimeoutMS": 500,
-           "connectTimeoutMS": 500
+          "retryWrites": false
         },
         "observeEvents": [
           "connectionCreatedEvent",
@@ -286,8 +282,7 @@
                   "isMaster",
                   "hello"
                 ],
-                "blockConnection": true,
-                "blockTimeMS": 1000,
+                "closeConnection": true,
                 "appName": "lbSDAMErrorTestClient"
               }
             }
@@ -350,8 +345,7 @@
                 "failCommands": [
                   "saslContinue"
                 ],
-                "blockConnection": true,
-                "blockTimeMS": 1000,
+                "closeConnection": true,
                 "appName": "lbSDAMErrorTestClient"
               }
             }
@@ -378,6 +372,9 @@
             {
               "connectionCreatedEvent": {}
             },
+            {
+              "poolClearedEvent": {}
+            },
             {
               "connectionClosedEvent": {
                 "reason": "error"
@@ -387,9 +384,6 @@
               "connectionCheckOutFailedEvent": {
                 "reason": "connectionError"
               }
-            },
-            {
-              "poolClearedEvent": {}
             }
           ]
         }
@@ -412,8 +406,7 @@
                 "failCommands": [
                   "getMore"
                 ],
-                "closeConnection": true,
-                "appName": "lbSDAMErrorTestClient"
+                "closeConnection": true
               }
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,7 @@`
`53`	`53`	`"failCommands": [`
`54`	`54`	`"saslContinue"`
`55`	`55`	`],`
`56`		`- "closeConnection": false,`
`57`		`- "blockConnection": true,`
`58`		`- "blockTimeMS": 1000,`
	`56`	`+ "closeConnection": true,`
`59`	`57`	`"appName": "authNetworkErrorTest"`
`60`	`58`	`}`
`61`	`59`	`}`
`@@ -77,8 +75,6 @@`
`77`	`75`	`],`
`78`	`76`	`"uriOptions": {`
`79`	`77`	`"retryWrites": false,`
`80`		`- "socketTimeoutMS": 500,`
`81`		`- "connectTimeoutMS": 500,`
`82`	`78`	`"appname": "authNetworkErrorTest"`
`83`	`79`	`}`
`84`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@`
`32`	`32`	`"useMultipleMongoses": false,`
`33`	`33`	`"uriOptions": {`
`34`	`34`	`"appname": "lbSDAMErrorTestClient",`
`35`		`- "socketTimeoutMS": 500,`
`36`		`- "connectTimeoutMS": 500,`
`37`	`35`	`"retryWrites": false`
`38`	`36`	`},`
`39`	`37`	`"observeEvents": [`
`@@ -66,9 +64,7 @@`
`66`	`64`	`"id": "multiClient",`
`67`	`65`	`"useMultipleMongoses": true,`
`68`	`66`	`"uriOptions": {`
`69`		`- "retryWrites": false,`
`70`		`- "socketTimeoutMS": 500,`
`71`		`- "connectTimeoutMS": 500`
	`67`	`+ "retryWrites": false`
`72`	`68`	`},`
`73`	`69`	`"observeEvents": [`
`74`	`70`	`"connectionCreatedEvent",`
`@@ -286,8 +282,7 @@`
`286`	`282`	`"isMaster",`
`287`	`283`	`"hello"`
`288`	`284`	`],`
`289`		`- "blockConnection": true,`
`290`		`- "blockTimeMS": 1000,`
	`285`	`+ "closeConnection": true,`
`291`	`286`	`"appName": "lbSDAMErrorTestClient"`
`292`	`287`	`}`
`293`	`288`	`}`
`@@ -350,8 +345,7 @@`
`350`	`345`	`"failCommands": [`
`351`	`346`	`"saslContinue"`
`352`	`347`	`],`
`353`		`- "blockConnection": true,`
`354`		`- "blockTimeMS": 1000,`
	`348`	`+ "closeConnection": true,`
`355`	`349`	`"appName": "lbSDAMErrorTestClient"`
`356`	`350`	`}`
`357`	`351`	`}`
`@@ -378,6 +372,9 @@`
`378`	`372`	`{`
`379`	`373`	`"connectionCreatedEvent": {}`
`380`	`374`	`},`
	`375`	`+ {`
	`376`	`+ "poolClearedEvent": {}`
	`377`	`+ },`
`381`	`378`	`{`
`382`	`379`	`"connectionClosedEvent": {`
`383`	`380`	`"reason": "error"`
`@@ -387,9 +384,6 @@`
`387`	`384`	`"connectionCheckOutFailedEvent": {`
`388`	`385`	`"reason": "connectionError"`
`389`	`386`	`}`
`390`		`- },`
`391`		`- {`
`392`		`- "poolClearedEvent": {}`
`393`	`387`	`}`
`394`	`388`	`]`
`395`	`389`	`}`
`@@ -412,8 +406,7 @@`
`412`	`406`	`"failCommands": [`
`413`	`407`	`"getMore"`
`414`	`408`	`],`
`415`		`- "closeConnection": true,`
`416`		`- "appName": "lbSDAMErrorTestClient"`
	`409`	`+ "closeConnection": true`
`417`	`410`	`}`
`418`	`411`	`}`
`419`	`412`	`}`