Skip to content

Commit 1bf9c8b

Browse files
authored
CXX-2685 Add 6.0 and 7.0 to EVG server version matrix (#989)
* Use WARN in Catch2 tests * Queryable Encryption requires 7.0+ * Add 6.0 (CXX-2501) and 7.0 (CXX-2685) to server version matrix
1 parent a4d9067 commit 1bf9c8b

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

.mci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ variables:
1616

1717
mongodb_version:
1818
version_latest: &version_latest "latest"
19+
version_70: &version_70 "7.0"
1920
version_60: &version_60 "6.0"
2021
version_50: &version_50 "5.0"
2122
version_44: &version_44 "4.4"
@@ -1167,6 +1168,14 @@ axes:
11671168
display_name: "Latest"
11681169
variables:
11691170
mongodb_version: *version_latest
1171+
- id: "7.0"
1172+
display_name: "7.0"
1173+
variables:
1174+
mongodb_version: *version_70
1175+
- id: "6.0"
1176+
display_name: "6.0"
1177+
variables:
1178+
mongodb_version: *version_60
11701179
- id: "5.0"
11711180
display_name: "5.0"
11721181
variables:

examples/mongocxx/mongodb.com/documentation_examples.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,7 @@ int main() {
16171617
snapshot_example2(conn);
16181618
}
16191619
if (should_run_client_side_encryption_test() && is_replica_set(conn) &&
1620-
version_at_least(db, 6)) {
1620+
version_at_least(db, 7)) {
16211621
queryable_encryption_api(conn);
16221622
}
16231623
} catch (const std::logic_error& e) {

src/mongocxx/test/client_side_encryption.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2501,12 +2501,12 @@ TEST_CASE("Create Encrypted Collection", "[client_side_encryption]") {
25012501
}
25022502

25032503
if (!test_util::newer_than(conn, "7.0")) {
2504-
std::cerr << "Explicit Encryption tests require MongoDB server 7.0+." << std::endl;
2504+
WARN("Explicit Encryption tests require MongoDB server 7.0+.");
25052505
return;
25062506
}
25072507

25082508
if (test_util::get_topology(conn) == "single") {
2509-
std::cerr << "Explicit Encryption tests must not run against a standalone." << std::endl;
2509+
WARN("Explicit Encryption tests must not run against a standalone.");
25102510
return;
25112511
}
25122512

0 commit comments

Comments
 (0)