Merge branch 'master' of github.com:mongodb/mongo-python-driver

Author: blink1073

.evergreen/remove-unimplemented-tests.sh

@@ -41,7 +41,7 @@ rm $PYMONGO/test/index_management/index-rawdata.json
 rm $PYMONGO/test/collection_management/modifyCollection-*.json
 
 # PYTHON-5248 - Remove support for MongoDB 4.0
-rm $PYMONGO/test/**/pre-42-*.json
+find /$PYMONGO /test -type f -name 'pre-42-*.json' -delete
 
 # PYTHON-3359 - Remove Database and Collection level timeout override
 rm $PYMONGO/test/csot/override-collection-timeoutMS.json

.evergreen/scripts/resync-all-specs.py

@@ -30,14 +30,18 @@ def resync_specs(directory: pathlib.Path, errored: dict[str, str]) -> None:
     print("Done syncing specs")
 
 
-def apply_patches():
+def apply_patches(errored):
     print("Beginning to apply patches")
     subprocess.run(["bash", "./.evergreen/remove-unimplemented-tests.sh"], check=True)  # noqa: S603, S607
-    subprocess.run(
-        ["git apply -R --allow-empty --whitespace=fix ./.evergreen/spec-patch/*"],  # noqa: S607
-        shell=True,  # noqa: S602
-        check=True,
-    )
+    try:
+        subprocess.run(
+            ["git apply -R --allow-empty --whitespace=fix ./.evergreen/spec-patch/*"],  # noqa: S607
+            shell=True,  # noqa: S602
+            check=True,
+            stderr=subprocess.PIPE,
+        )
+    except CalledProcessError as exc:
+        errored["applying patches"] = exc.stderr
 
 
 def check_new_spec_directories(directory: pathlib.Path) -> list[str]:
@@ -85,7 +89,7 @@ def write_summary(errored: dict[str, str], new: list[str], filename: Optional[st
         pr_body += "\n -".join(succeeded)
         pr_body += "\n"
     if len(errored) > 0:
-        pr_body += "\n\nThe following spec syncs encountered errors:\n -"
+        pr_body += "\n\nThe following spec syncs encountered errors:"
         for k, v in errored.items():
             pr_body += f"\n -{k}\n```{v}\n```"
         pr_body += "\n"
@@ -106,7 +110,7 @@ def main(args: Namespace):
     directory = pathlib.Path("./test")
     errored: dict[str, str] = {}
     resync_specs(directory, errored)
-    apply_patches()
+    apply_patches(errored)
     new = check_new_spec_directories(directory)
     write_summary(errored, new, args.filename)
 

.evergreen/scripts/resync-all-specs.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 # Run spec syncing script and create PR
+set -eu
 
 # SETUP
 SRC_URL="https://github.com/mongodb/specifications.git"

.evergreen/spec-patch/PYTHON-3712.patch

@@ -1,14 +1,14 @@
 diff --git a/test/discovery_and_monitoring/unified/serverMonitoringMode.json b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
-index 4b492f7d8..e44fad1bc 100644
+index e44fad1b..4b492f7d 100644
 --- a/test/discovery_and_monitoring/unified/serverMonitoringMode.json
 +++ b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
-@@ -5,8 +5,7 @@
+@@ -5,7 +5,8 @@
      {
        "topologies": [
          "single",
-+        "sharded"
--        "sharded",
--        "sharded-replicaset"
+-        "sharded"
++        "sharded",
++        "sharded-replicaset"
        ],
        "serverless": "forbid"
      }