Skip to content

Commit 3e1c14e

Browse files
RUST-1643 Test against MongoDB 7.0 (#881)
1 parent 6a6a93d commit 3e1c14e

File tree

2 files changed

+81
-4
lines changed

2 files changed

+81
-4
lines changed

.evergreen/config.yml

+71-2
Original file line numberDiff line numberDiff line change
@@ -1144,6 +1144,66 @@ tasks:
11441144
- func: "run aws auth test with aws EC2 credentials"
11451145
- func: "run aws ECS auth test"
11461146

1147+
- name: "test-7.0-standalone"
1148+
tags: ["7.0", "standalone"]
1149+
commands:
1150+
- func: "install junit dependencies"
1151+
- func: "bootstrap mongo-orchestration"
1152+
vars:
1153+
MONGODB_VERSION: "7.0"
1154+
TOPOLOGY: "server"
1155+
- func: "run tests"
1156+
1157+
- name: "test-7.0-replica_set"
1158+
tags: ["7.0", "replica_set"]
1159+
commands:
1160+
- func: "install junit dependencies"
1161+
- func: "bootstrap mongo-orchestration"
1162+
vars:
1163+
MONGODB_VERSION: "7.0"
1164+
TOPOLOGY: "replica_set"
1165+
- func: "run tests"
1166+
1167+
- name: "test-7.0-sharded_cluster"
1168+
tags: ["7.0", "sharded_cluster"]
1169+
commands:
1170+
- func: "install junit dependencies"
1171+
- func: "bootstrap mongo-orchestration"
1172+
vars:
1173+
MONGODB_VERSION: "7.0"
1174+
TOPOLOGY: "sharded_cluster"
1175+
- func: "run tests"
1176+
1177+
- name: "test-7.0-load_balancer"
1178+
tags: ["7.0", "load_balancer"]
1179+
commands:
1180+
- func: "install junit dependencies"
1181+
- func: "bootstrap mongo-orchestration"
1182+
vars:
1183+
MONGODB_VERSION: "7.0"
1184+
TOPOLOGY: "sharded_cluster"
1185+
LOAD_BALANCER: "true"
1186+
- func: "start load balancer"
1187+
- func: "run tests"
1188+
1189+
- name: "test-7.0-aws-auth"
1190+
# "7.0" explicitly left off to keep this out of the generic matrix
1191+
tags: ["aws-auth"]
1192+
commands:
1193+
- func: "bootstrap mongo-orchestration"
1194+
vars:
1195+
ORCHESTRATION_FILE: "auth-aws.json"
1196+
MONGODB_VERSION: "7.0"
1197+
AUTH: "auth"
1198+
TOPOLOGY: "server"
1199+
- func: "add aws auth variables to file"
1200+
- func: "run aws auth test with regular aws credentials"
1201+
- func: "run aws auth test with assume role credentials"
1202+
- func: "run aws auth test with aws credentials as environment variables"
1203+
- func: "run aws auth test with aws credentials and session token as environment variables"
1204+
- func: "run aws auth test with aws EC2 credentials"
1205+
- func: "run aws ECS auth test"
1206+
11471207
- name: "test-rapid-standalone"
11481208
tags: ["rapid", "standalone"]
11491209
commands:
@@ -1707,6 +1767,10 @@ axes:
17071767
display_name: "rapid"
17081768
variables:
17091769
MONGODB_VERSION: "rapid"
1770+
- id: "7.0"
1771+
display_name: "7.0"
1772+
variables:
1773+
MONGODB_VERSION: "7.0"
17101774
- id: "6.0"
17111775
display_name: "6.0"
17121776
variables:
@@ -2061,6 +2125,7 @@ buildvariants:
20612125
tasks:
20622126
- ".latest"
20632127
- ".rapid"
2128+
- ".7.0"
20642129
- ".6.0"
20652130
- ".5.0"
20662131
- ".4.4"
@@ -2134,6 +2199,7 @@ buildvariants:
21342199
mongodb-version:
21352200
- "latest"
21362201
- "rapid"
2202+
- "7.0"
21372203
- "6.0"
21382204
- "5.0"
21392205
- "4.4"
@@ -2171,6 +2237,7 @@ buildvariants:
21712237
mongodb-version:
21722238
- "latest"
21732239
- "rapid"
2240+
- "7.0"
21742241
- "6.0"
21752242
topology:
21762243
- "replica-set"
@@ -2188,7 +2255,7 @@ buildvariants:
21882255
- macos-11.00
21892256
- windows-64-vs2017
21902257
mongodb-version:
2191-
- "6.0"
2258+
- "7.0"
21922259
topology:
21932260
- "standalone"
21942261
crypt-shared:
@@ -2206,6 +2273,7 @@ buildvariants:
22062273
mongodb-version:
22072274
- "latest"
22082275
- "rapid"
2276+
- "7.0"
22092277
- "6.0"
22102278
- "5.0"
22112279
- "4.4"
@@ -2243,7 +2311,7 @@ buildvariants:
22432311
- macos-11.00
22442312
- windows-64-vs2017
22452313
mongodb-version:
2246-
- "6.0"
2314+
- "7.0"
22472315
topology:
22482316
- "standalone"
22492317
crypt-shared:
@@ -2338,6 +2406,7 @@ buildvariants:
23382406
tasks:
23392407
- ".latest .standalone"
23402408
- ".rapid .standalone"
2409+
- ".7.0 .standalone"
23412410
- ".6.0 .standalone"
23422411
- ".5.0 .standalone"
23432412

src/test/spec/sessions.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,17 @@ use crate::{
3030
#[cfg_attr(feature = "async-std-runtime", async_std::test)]
3131
async fn run_unified() {
3232
let _guard: RwLockWriteGuard<()> = LOCK.run_exclusively().await;
33+
34+
// TODO RUST-1414: unskip this file
35+
let mut skipped_files = vec!["implicit-sessions-default-causal-consistency.json"];
36+
let client = TestClient::new().await;
37+
if client.is_sharded() && client.server_version_gte(7, 0) {
38+
// TODO RUST-1666: unskip this file
39+
skipped_files.push("snapshot-sessions.json");
40+
}
41+
3342
run_unified_tests(&["sessions"])
34-
// TODO RUST-1414: unskip this file
35-
.skip_files(&["implicit-sessions-default-causal-consistency.json"])
43+
.skip_files(&skipped_files)
3644
.await;
3745
}
3846

0 commit comments

Comments
 (0)