From 3b4357e62300a0e618a351cf521a0c2be39ac955 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steven.silvester@ieee.org>
Date: Fri, 15 Aug 2025 11:58:39 -0500
Subject: [PATCH 1/2] PYTHON-5493 Add a patch for the log order difference
 (#2473)

(cherry picked from commit e44ece0b07d4bb81ef8a5678ad01014070c1a374)
---
 .evergreen/spec-patch/PYTHON-5493.patch       | 99 +++++++++++++++++++
 .../connection-logging.json                   | 32 +++---
 2 files changed, 115 insertions(+), 16 deletions(-)
 create mode 100644 .evergreen/spec-patch/PYTHON-5493.patch

diff --git a/.evergreen/spec-patch/PYTHON-5493.patch b/.evergreen/spec-patch/PYTHON-5493.patch
new file mode 100644
index 0000000000..cf1afbb271
--- /dev/null
+++ b/.evergreen/spec-patch/PYTHON-5493.patch
@@ -0,0 +1,99 @@
+diff --git a/test/connection_logging/connection-logging.json b/test/connection_logging/connection-logging.json
+index d40cfbb7e..5799e834d 100644
+--- a/test/connection_logging/connection-logging.json
++++ b/test/connection_logging/connection-logging.json
+@@ -272,7 +272,13 @@
+               "level": "debug",
+               "component": "connection",
+               "data": {
+-                "message": "Connection pool closed",
++                "message": "Connection closed",
++                "driverConnectionId": {
++                  "$$type": [
++                    "int",
++                    "long"
++                  ]
++                },
+                 "serverHost": {
+                   "$$type": "string"
+                 },
+@@ -281,20 +287,15 @@
+                     "int",
+                     "long"
+                   ]
+-                }
++                },
++                "reason": "Connection pool was closed"
+               }
+             },
+             {
+               "level": "debug",
+               "component": "connection",
+               "data": {
+-                "message": "Connection closed",
+-                "driverConnectionId": {
+-                  "$$type": [
+-                    "int",
+-                    "long"
+-                  ]
+-                },
++                "message": "Connection pool closed",
+                 "serverHost": {
+                   "$$type": "string"
+                 },
+@@ -303,8 +304,7 @@
+                     "int",
+                     "long"
+                   ]
+-                },
+-                "reason": "Connection pool was closed"
++                }
+               }
+             }
+           ]
+@@ -446,22 +446,6 @@
+                 }
+               }
+             },
+-            {
+-              "level": "debug",
+-              "component": "connection",
+-              "data": {
+-                "message": "Connection pool cleared",
+-                "serverHost": {
+-                  "$$type": "string"
+-                },
+-                "serverPort": {
+-                  "$$type": [
+-                    "int",
+-                    "long"
+-                  ]
+-                }
+-              }
+-            },
+             {
+               "level": "debug",
+               "component": "connection",
+@@ -514,6 +498,22 @@
+                   ]
+                 }
+               }
++            },
++            {
++              "level": "debug",
++              "component": "connection",
++              "data": {
++                "message": "Connection pool cleared",
++                "serverHost": {
++                  "$$type": "string"
++                },
++                "serverPort": {
++                  "$$type": [
++                    "int",
++                    "long"
++                  ]
++                }
++              }
+             }
+           ]
+         }
diff --git a/test/connection_logging/connection-logging.json b/test/connection_logging/connection-logging.json
index 72103b3cab..5799e834d7 100644
--- a/test/connection_logging/connection-logging.json
+++ b/test/connection_logging/connection-logging.json
@@ -446,22 +446,6 @@
                 }
               }
             },
-            {
-              "level": "debug",
-              "component": "connection",
-              "data": {
-                "message": "Connection pool cleared",
-                "serverHost": {
-                  "$$type": "string"
-                },
-                "serverPort": {
-                  "$$type": [
-                    "int",
-                    "long"
-                  ]
-                }
-              }
-            },
             {
               "level": "debug",
               "component": "connection",
@@ -514,6 +498,22 @@
                   ]
                 }
               }
+            },
+            {
+              "level": "debug",
+              "component": "connection",
+              "data": {
+                "message": "Connection pool cleared",
+                "serverHost": {
+                  "$$type": "string"
+                },
+                "serverPort": {
+                  "$$type": [
+                    "int",
+                    "long"
+                  ]
+                }
+              }
             }
           ]
         }

From 2eec4aa05e4ec52576c268b9c33f7c8a6db88049 Mon Sep 17 00:00:00 2001
From: Steven Silvester <steve.silvester@mongodb.com>
Date: Mon, 18 Aug 2025 13:15:16 -0500
Subject: [PATCH 2/2] add just fix

---
 .evergreen/scripts/install-dependencies.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.evergreen/scripts/install-dependencies.sh b/.evergreen/scripts/install-dependencies.sh
index 49fc614ca7..23d865d0d8 100755
--- a/.evergreen/scripts/install-dependencies.sh
+++ b/.evergreen/scripts/install-dependencies.sh
@@ -52,6 +52,8 @@ if ! command -v just &>/dev/null; then
   echo "Installing just..."
   mkdir -p "$_BIN_DIR" 2>/dev/null || true
   curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- $_TARGET --to "$_BIN_DIR" || {
+    # Remove just file if it exists (can be created if there was an install error).
+    rm -f ${_BIN_DIR}/just
     _pip_install rust-just just
   }
   echo "Installing just... done."