From 8d0c26fca35a918ea3cba29ff2b497e2dfa0e8f7 Mon Sep 17 00:00:00 2001 From: Jeffrey 'Alex' Clark Date: Fri, 24 Apr 2026 18:36:07 -0400 Subject: [PATCH] Remove stale spec patches for closed tickets PYTHON-2673 (connection pinning for load balanced clusters), PYTHON-3712 (deprecate sharded-replicaset topology type), and PYTHON-4261 (server selection log line noise) are all closed/fixed. Their patch files were never removed, causing PYTHON-2673 to fail to apply on every spec sync run since the underlying test files moved on after the tickets were resolved. --- .evergreen/spec-patch/PYTHON-2673.patch | 64 ------------------------- .evergreen/spec-patch/PYTHON-3712.patch | 14 ------ .evergreen/spec-patch/PYTHON-4261.patch | 61 ----------------------- 3 files changed, 139 deletions(-) delete mode 100644 .evergreen/spec-patch/PYTHON-2673.patch delete mode 100644 .evergreen/spec-patch/PYTHON-3712.patch delete mode 100644 .evergreen/spec-patch/PYTHON-4261.patch diff --git a/.evergreen/spec-patch/PYTHON-2673.patch b/.evergreen/spec-patch/PYTHON-2673.patch deleted file mode 100644 index 868538f7b7..0000000000 --- a/.evergreen/spec-patch/PYTHON-2673.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/test/load_balancer/cursors.json b/test/load_balancer/cursors.json -index 43e4fbb4f..4e2a55fd4 100644 ---- a/test/load_balancer/cursors.json -+++ b/test/load_balancer/cursors.json -@@ -376,7 +376,7 @@ - ] - }, - { -+ "description": "pinned connections are not returned after an network error during getMore", -- "description": "pinned connections are returned after an network error during getMore", - "operations": [ - { - "name": "failPoint", -@@ -440,7 +440,7 @@ - "object": "testRunner", - "arguments": { - "client": "client0", -+ "connections": 1 -- "connections": 0 - } - }, - { -@@ -659,7 +659,7 @@ - ] - }, - { -+ "description": "pinned connections are not returned to the pool after a non-network error on getMore", -- "description": "pinned connections are returned to the pool after a non-network error on getMore", - "operations": [ - { - "name": "failPoint", -@@ -715,7 +715,7 @@ - "object": "testRunner", - "arguments": { - "client": "client0", -+ "connections": 1 -- "connections": 0 - } - }, - { -diff --git a/test/load_balancer/sdam-error-handling.json b/test/load_balancer/sdam-error-handling.json -index 63aabc04d..462fa0aac 100644 ---- a/test/load_balancer/sdam-error-handling.json -+++ b/test/load_balancer/sdam-error-handling.json -@@ -366,6 +366,9 @@ - { - "connectionCreatedEvent": {} - }, -+ { -+ "poolClearedEvent": {} -+ }, - { - "connectionClosedEvent": { - "reason": "error" -@@ -378,9 +375,6 @@ - "connectionCheckOutFailedEvent": { - "reason": "connectionError" - } -- }, -- { -- "poolClearedEvent": {} - } - ] - } diff --git a/.evergreen/spec-patch/PYTHON-3712.patch b/.evergreen/spec-patch/PYTHON-3712.patch deleted file mode 100644 index b48c05124c..0000000000 --- a/.evergreen/spec-patch/PYTHON-3712.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/test/discovery_and_monitoring/unified/serverMonitoringMode.json b/test/discovery_and_monitoring/unified/serverMonitoringMode.json -index e44fad1b..4b492f7d 100644 ---- a/test/discovery_and_monitoring/unified/serverMonitoringMode.json -+++ b/test/discovery_and_monitoring/unified/serverMonitoringMode.json -@@ -5,7 +5,8 @@ - { - "topologies": [ - "single", -- "sharded" -+ "sharded", -+ "sharded-replicaset" - ], - "serverless": "forbid" - } diff --git a/.evergreen/spec-patch/PYTHON-4261.patch b/.evergreen/spec-patch/PYTHON-4261.patch deleted file mode 100644 index e4ffc5ce9f..0000000000 --- a/.evergreen/spec-patch/PYTHON-4261.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/test/server_selection_logging/replica-set.json b/test/server_selection_logging/replica-set.json -index 830b1ea51..5eba784bf 100644 ---- a/test/server_selection_logging/replica-set.json -+++ b/test/server_selection_logging/replica-set.json -@@ -184,7 +184,7 @@ - } - }, - { -- "level": "debug", -+ "level": "info", - "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 -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", -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", -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",