Fix PYTHON-4261.patch whitespace

NoahStapp · NoahStapp · commit f5057288eedf · 2025-07-30T10:14:42.000-04:00
diff --git a/.evergreen/scripts/resync-all-specs.py b/.evergreen/scripts/resync-all-specs.py
@@ -34,7 +34,7 @@ def apply_patches():
     print("Beginning to apply patches")  # noqa: T201
     subprocess.run(["bash", "./.evergreen/remove-unimplemented-tests.sh"], check=True)  # noqa: S603, S607
     subprocess.run(
-        ["git apply -R --allow-empty --ignore-whitespace ./.evergreen/spec-patch/*"],  # noqa: S607
+        ["git apply -R --allow-empty --whitespace=fix ./.evergreen/spec-patch/*"],  # noqa: S607
         shell=True,  # noqa: S602
         check=True,
     )
diff --git a/.evergreen/spec-patch/PYTHON-4261.patch b/.evergreen/spec-patch/PYTHON-4261.patch
@@ -16,24 +16,46 @@ index 830b1ea51..5eba784bf 100644
 --- a/test/server_selection_logging/standalone.json
 +++ b/test/server_selection_logging/standalone.json
 @@ -191,7 +191,7 @@
-              }
-            },
-            {
--             "level": "debug",
-+             "level": "info",
-              "component": "serverSelection",
-              "data": {
-                "message": "Waiting for suitable server to become available",
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",
 diff --git a/test/server_selection_logging/sharded.json b/test/server_selection_logging/sharded.json
 index 830b1ea51..5eba784bf 100644
 --- a/test/server_selection_logging/sharded.json
 +++ b/test/server_selection_logging/sharded.json
 @@ -193,7 +193,7 @@
-              }
-            },
-            {
--             "level": "debug",
-+             "level": "info",
-              "component": "serverSelection",
-              "data": {
-                "message": "Waiting for suitable server to become available",
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",
+diff --git a/test/server_selection_logging/sharded.json b/test/server_selection_logging/operation-id.json
+index 830b1ea51..5eba784bf 100644
+--- a/test/server_selection_logging/operation-id.json
++++ b/test/server_selection_logging/operation-id.json
+@@ -197,7 +197,7 @@
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",
+@@ -383,7 +383,7 @@
+               }
+             },
+             {
+-              "level": "debug",
++              "level": "info",
+               "component": "serverSelection",
+               "data": {
+                 "message": "Waiting for suitable server to become available",
diff --git a/test/server_selection_logging/operation-id.json b/test/server_selection_logging/operation-id.json
@@ -197,7 +197,7 @@
               }
             },
             {
-              "level": "info",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",
@@ -383,7 +383,7 @@
               }
             },
             {
-              "level": "info",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",
diff --git a/test/server_selection_logging/sharded.json b/test/server_selection_logging/sharded.json
@@ -193,7 +193,7 @@
               }
             },
             {
-             "level": "debug",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",
diff --git a/test/server_selection_logging/standalone.json b/test/server_selection_logging/standalone.json
@@ -191,7 +191,7 @@
               }
             },
             {
-             "level": "debug",
+              "level": "debug",
               "component": "serverSelection",
               "data": {
                 "message": "Waiting for suitable server to become available",

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ def apply_patches():`
`34`	`34`	`print("Beginning to apply patches") # noqa: T201`
`35`	`35`	`subprocess.run(["bash", "./.evergreen/remove-unimplemented-tests.sh"], check=True) # noqa: S603, S607`
`36`	`36`	`subprocess.run(`
`37`		`- ["git apply -R --allow-empty --ignore-whitespace ./.evergreen/spec-patch/*"], # noqa: S607`
	`37`	`+ ["git apply -R --allow-empty --whitespace=fix ./.evergreen/spec-patch/*"], # noqa: S607`
`38`	`38`	`shell=True, # noqa: S602`
`39`	`39`	`check=True,`
`40`	`40`	`)`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@`
`197`	`197`	`}`
`198`	`198`	`},`
`199`	`199`	`{`
`200`		`- "level": "info",`
	`200`	`+ "level": "debug",`
`201`	`201`	`"component": "serverSelection",`
`202`	`202`	`"data": {`
`203`	`203`	`"message": "Waiting for suitable server to become available",`
`@@ -383,7 +383,7 @@`
`383`	`383`	`}`
`384`	`384`	`},`
`385`	`385`	`{`
`386`		`- "level": "info",`
	`386`	`+ "level": "debug",`
`387`	`387`	`"component": "serverSelection",`
`388`	`388`	`"data": {`
`389`	`389`	`"message": "Waiting for suitable server to become available",`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@`
`193`	`193`	`}`
`194`	`194`	`},`
`195`	`195`	`{`
`196`		`- "level": "debug",`
	`196`	`+ "level": "debug",`
`197`	`197`	`"component": "serverSelection",`
`198`	`198`	`"data": {`
`199`	`199`	`"message": "Waiting for suitable server to become available",`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@`
`191`	`191`	`}`
`192`	`192`	`},`
`193`	`193`	`{`
`194`		`- "level": "debug",`
	`194`	`+ "level": "debug",`
`195`	`195`	`"component": "serverSelection",`
`196`	`196`	`"data": {`
`197`	`197`	`"message": "Waiting for suitable server to become available",`