Skip to content

Commit b33ed17

Browse files
committed
Sync feature with master
2 parents a2eb6f4 + bd6decb commit b33ed17

39 files changed

+1598
-184
lines changed

.evergreen/generated_configs/variants.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,15 @@ buildvariants:
133133
- rhel87-small
134134
expansions:
135135
COMPRESSOR: zstd
136+
- name: compression-zstd-ubuntu-22
137+
tasks:
138+
- name: .test-standard !.server-4.2 !.server-4.4 !.server-5.0 .python-3.14
139+
- name: .test-standard !.server-4.2 !.server-4.4 !.server-5.0 .python-3.14t
140+
display_name: Compression zstd Ubuntu-22
141+
run_on:
142+
- ubuntu2204-small
143+
expansions:
144+
COMPRESSOR: ztsd
136145

137146
# Coverage report tests
138147
- name: coverage-report

.evergreen/remove-unimplemented-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ rm $PYMONGO/test/index_management/index-rawdata.json
4141
rm $PYMONGO/test/collection_management/modifyCollection-*.json
4242

4343
# PYTHON-5248 - Remove support for MongoDB 4.0
44-
find /$PYMONGO /test -type f -name 'pre-42-*.json' -delete
44+
find /$PYMONGO/test -type f -name 'pre-42-*.json' -delete
4545

4646
# PYTHON-3359 - Remove Database and Collection level timeout override
4747
rm $PYMONGO/test/csot/override-collection-timeoutMS.json

.evergreen/scripts/generate_config.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,22 @@ def create_compression_variants():
194194
expansions=expansions,
195195
)
196196
)
197+
# Add explicit tests with compression.zstd support on linux.
198+
host = HOSTS["ubuntu22"]
199+
expansions = dict(COMPRESSOR="ztsd")
200+
tasks = [
201+
".test-standard !.server-4.2 !.server-4.4 !.server-5.0 .python-3.14",
202+
".test-standard !.server-4.2 !.server-4.4 !.server-5.0 .python-3.14t",
203+
]
204+
display_name = get_variant_name(f"Compression {compressor}", host)
205+
variants.append(
206+
create_variant(
207+
tasks,
208+
display_name,
209+
host=host,
210+
expansions=expansions,
211+
)
212+
)
197213
return variants
198214

199215

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/test/auth/legacy/connection-string.json b/test/auth/legacy/connection-string.json
2+
index 3a099c813..8982b61d5 100644
3+
--- a/test/auth/legacy/connection-string.json
4+
+++ b/test/auth/legacy/connection-string.json
5+
@@ -440,6 +440,21 @@
6+
}
7+
}
8+
},
9+
+ {
10+
+ "description": "should throw an exception if username provided (MONGODB-AWS)",
11+
+ "uri": "mongodb://user@localhost.com/?authMechanism=MONGODB-AWS",
12+
+ "valid": false
13+
+ },
14+
+ {
15+
+ "description": "should throw an exception if username and password provided (MONGODB-AWS)",
16+
+ "uri": "mongodb://user:pass@localhost.com/?authMechanism=MONGODB-AWS",
17+
+ "valid": false
18+
+ },
19+
+ {
20+
+ "description": "should throw an exception if AWS_SESSION_TOKEN provided (MONGODB-AWS)",
21+
+ "uri": "mongodb://localhost/?authMechanism=MONGODB-AWS&authMechanismProperties=AWS_SESSION_TOKEN:token",
22+
+ "valid": false
23+
+ },
24+
{
25+
"description": "should recognise the mechanism with test environment (MONGODB-OIDC)",
26+
"uri": "mongodb://localhost/?authMechanism=MONGODB-OIDC&authMechanismProperties=ENVIRONMENT:test",

0 commit comments

Comments
 (0)