Skip to content

Commit bfaab82

Browse files
mongodb-drivers-pr-bot[bot]Cloud UserNoahStapp
authored
[Spec Resync] 07-28-2025 (mongodb#2447)
Co-authored-by: Cloud User <ec2-user@ip-10-128-23-129.ec2.internal> Co-authored-by: Noah Stapp <noah.stapp@mongodb.com>
1 parent 9f64dad commit bfaab82

23 files changed

+215
-1300
lines changed

‎.evergreen/remove-unimplemented-tests.sh‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,17 @@ rm $PYMONGO/test/crud/unified/updateMany-rawdata.json
4141
rm $PYMONGO/test/crud/unified/updateOne-rawdata.json
4242
rm $PYMONGO/test/index_management/index-rawdata.json
4343

44-
echo "Done removing unimplemented tests\n"
44+
# PyMongo does not support modifyCollection
45+
rm $PYMONGO/test/collection_management/modifyCollection-*.json
46+
47+
# PYTHON-5248 - Remove support for MongoDB 4.0
48+
rm $PYMONGO/test/**/pre-42-*.json
49+
50+
# PYTHON-3359 - Remove Database and Collection level timeout override
51+
rm $PYMONGO/test/csot/override-collection-timeoutMS.json
52+
rm $PYMONGO/test/csot/override-database-timeoutMS.json
53+
54+
# PYTHON-2943 - Socks5 Proxy Support
55+
rm $PYMONGO/test/uri_options/proxy-options.json
56+
57+
echo "Done removing unimplemented tests"

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ def resync_specs(directory: pathlib.Path, errored: dict[str, str]) -> None:
3333
def apply_patches():
3434
print("Beginning to apply patches") # noqa: T201
3535
subprocess.run(["bash", "./.evergreen/remove-unimplemented-tests.sh"], check=True) # noqa: S603, S607
36-
subprocess.run(["git apply -R --allow-empty ./.evergreen/spec-patch/*"], shell=True, check=True) # noqa: S602, S607
36+
subprocess.run(
37+
["git apply -R --allow-empty --whitespace=fix ./.evergreen/spec-patch/*"], # noqa: S607
38+
shell=True, # noqa: S602
39+
check=True,
40+
)
3741

3842

3943
def check_new_spec_directories(directory: pathlib.Path) -> list[str]:

‎.evergreen/spec-patch/PYTHON-2673.patch‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
diff --git a/test/load_balancer/cursors.json b/test/load_balancer/cursors.json
2+
index 43e4fbb4f..4e2a55fd4 100644
3+
--- a/test/load_balancer/cursors.json
4+
+++ b/test/load_balancer/cursors.json
5+
@@ -376,7 +376,7 @@
6+
]
7+
},
8+
{
9+
+ "description": "pinned connections are not returned after an network error during getMore",
10+
- "description": "pinned connections are returned after an network error during getMore",
11+
"operations": [
12+
{
13+
"name": "failPoint",
14+
@@ -440,7 +440,7 @@
15+
"object": "testRunner",
16+
"arguments": {
17+
"client": "client0",
18+
+ "connections": 1
19+
- "connections": 0
20+
}
21+
},
22+
{
23+
@@ -659,7 +659,7 @@
24+
]
25+
},
26+
{
27+
+ "description": "pinned connections are not returned to the pool after a non-network error on getMore",
28+
- "description": "pinned connections are returned to the pool after a non-network error on getMore",
29+
"operations": [
30+
{
31+
"name": "failPoint",
32+
@@ -715,7 +715,7 @@
33+
"object": "testRunner",
34+
"arguments": {
35+
"client": "client0",
36+
+ "connections": 1
37+
- "connections": 0
38+
}
39+
},
40+
{
41+
diff --git a/test/load_balancer/sdam-error-handling.json b/test/load_balancer/sdam-error-handling.json
42+
index 63aabc04d..462fa0aac 100644
43+
--- a/test/load_balancer/sdam-error-handling.json
44+
+++ b/test/load_balancer/sdam-error-handling.json
45+
@@ -366,6 +366,9 @@
46+
{
47+
"connectionCreatedEvent": {}
48+
},
49+
+ {
50+
+ "poolClearedEvent": {}
51+
+ },
52+
{
53+
"connectionClosedEvent": {
54+
"reason": "error"
55+
@@ -378,9 +375,6 @@
56+
"connectionCheckOutFailedEvent": {
57+
"reason": "connectionError"
58+
}
59+
- },
60+
- {
61+
- "poolClearedEvent": {}
62+
}
63+
]
64+
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/test/discovery_and_monitoring/unified/serverMonitoringMode.json b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
2+
index 4b492f7d8..e44fad1bc 100644
3+
--- a/test/discovery_and_monitoring/unified/serverMonitoringMode.json
4+
+++ b/test/discovery_and_monitoring/unified/serverMonitoringMode.json
5+
@@ -5,8 +5,7 @@
6+
{
7+
"topologies": [
8+
"single",
9+
+ "sharded"
10+
- "sharded",
11+
- "sharded-replicaset"
12+
],
13+
"serverless": "forbid"
14+
}

‎.evergreen/spec-patch/PYTHON-4261.patch‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
diff --git a/test/server_selection_logging/replica-set.json b/test/server_selection_logging/replica-set.json
2+
index 830b1ea51..5eba784bf 100644
3+
--- a/test/server_selection_logging/replica-set.json
4+
+++ b/test/server_selection_logging/replica-set.json
5+
@@ -184,7 +184,7 @@
6+
}
7+
},
8+
{
9+
- "level": "debug",
10+
+ "level": "info",
11+
"component": "serverSelection",
12+
"data": {
13+
"message": "Waiting for suitable server to become available",
14+
diff --git a/test/server_selection_logging/standalone.json b/test/server_selection_logging/standalone.json
15+
index 830b1ea51..5eba784bf 100644
16+
--- a/test/server_selection_logging/standalone.json
17+
+++ b/test/server_selection_logging/standalone.json
18+
@@ -191,7 +191,7 @@
19+
}
20+
},
21+
{
22+
- "level": "debug",
23+
+ "level": "info",
24+
"component": "serverSelection",
25+
"data": {
26+
"message": "Waiting for suitable server to become available",
27+
diff --git a/test/server_selection_logging/sharded.json b/test/server_selection_logging/sharded.json
28+
index 830b1ea51..5eba784bf 100644
29+
--- a/test/server_selection_logging/sharded.json
30+
+++ b/test/server_selection_logging/sharded.json
31+
@@ -193,7 +193,7 @@
32+
}
33+
},
34+
{
35+
- "level": "debug",
36+
+ "level": "info",
37+
"component": "serverSelection",
38+
"data": {
39+
"message": "Waiting for suitable server to become available",
40+
diff --git a/test/server_selection_logging/sharded.json b/test/server_selection_logging/operation-id.json
41+
index 830b1ea51..5eba784bf 100644
42+
--- a/test/server_selection_logging/operation-id.json
43+
+++ b/test/server_selection_logging/operation-id.json
44+
@@ -197,7 +197,7 @@
45+
}
46+
},
47+
{
48+
- "level": "debug",
49+
+ "level": "info",
50+
"component": "serverSelection",
51+
"data": {
52+
"message": "Waiting for suitable server to become available",
53+
@@ -383,7 +383,7 @@
54+
}
55+
},
56+
{
57+
- "level": "debug",
58+
+ "level": "info",
59+
"component": "serverSelection",
60+
"data": {
61+
"message": "Waiting for suitable server to become available",

‎test/bson_corpus/decimal128-1.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,30 @@
312312
"canonical_bson": "18000000136400000000000a5bc138938d44c64d31cc3700",
313313
"degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\"}}",
314314
"canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"1.000000000000000000000000000000000E+999\"}}"
315+
},
316+
{
317+
"description": "Clamped zeros with a large positive exponent",
318+
"canonical_bson": "180000001364000000000000000000000000000000FE5F00",
319+
"degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+2147483647\"}}",
320+
"canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E+6111\"}}"
321+
},
322+
{
323+
"description": "Clamped zeros with a large negative exponent",
324+
"canonical_bson": "180000001364000000000000000000000000000000000000",
325+
"degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-2147483647\"}}",
326+
"canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"0E-6176\"}}"
327+
},
328+
{
329+
"description": "Clamped negative zeros with a large positive exponent",
330+
"canonical_bson": "180000001364000000000000000000000000000000FEDF00",
331+
"degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E+2147483647\"}}",
332+
"canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E+6111\"}}"
333+
},
334+
{
335+
"description": "Clamped negative zeros with a large negative exponent",
336+
"canonical_bson": "180000001364000000000000000000000000000000008000",
337+
"degenerate_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-2147483647\"}}",
338+
"canonical_extjson": "{\"d\" : {\"$numberDecimal\" : \"-0E-6176\"}}"
315339
}
316340
]
317341
}

‎test/collection_management/modifyCollection-pre_and_post_images.json‎

Lines changed: 0 additions & 111 deletions
This file was deleted.

‎test/collection_management/timeseries-collection.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
"description": "createCollection with bucketing options",
256256
"runOnRequirements": [
257257
{
258-
"minServerVersion": "7.0"
258+
"minServerVersion": "6.3"
259259
}
260260
],
261261
"operations": [

0 commit comments

Comments
 (0)