Skip to content

Commit 862a8e6

Browse files
authored
RUST-1885 Fix FLE tests broken on -latest (#1052)
1 parent ef2f20f commit 862a8e6

File tree

87 files changed

+173
-44
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+173
-44
lines changed

src/test/csfle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2986,7 +2986,7 @@ async fn range_explicit_encryption() -> Result<()> {
29862986
return Ok(());
29872987
}
29882988
let client = TestClient::new().await;
2989-
if client.server_version_lt(6, 2) || client.is_standalone() {
2989+
if client.server_version_lt(6, 2) || client.server_version_gte(8, 0) || client.is_standalone() {
29902990
log_uncaptured("Skipping range_explicit_encryption due to unsupported topology");
29912991
return Ok(());
29922992
}

src/test/spec/json/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

src/test/spec/json/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ runOn:
55
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
66
# FLE 2 Encrypted collections are not supported on standalone.
77
topology: [ "replicaset", "sharded", "load-balanced" ]
8+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
9+
maxServerVersion: "7.99.99"
810
database_name: &database_name "default"
911
collection_name: &collection_name "default"
1012
data: []

src/test/spec/json/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

src/test/spec/json/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ runOn:
77
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
88
# FLE 2 Encrypted collections are not supported on standalone.
99
topology: [ "replicaset", "sharded", "load-balanced" ]
10+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
11+
maxServerVersion: "7.99.99"
1012
database_name: &database_name "default"
1113
collection_name: &collection_name "default"
1214
data: []

src/test/spec/json/client-side-encryption/legacy/fle2v2-Range-Date-Delete.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

src/test/spec/json/client-side-encryption/legacy/fle2v2-Range-Date-Delete.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ runOn:
55
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
66
# FLE 2 Encrypted collections are not supported on standalone.
77
topology: [ "replicaset", "sharded", "load-balanced" ]
8+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
9+
maxServerVersion: "7.99.99"
810
database_name: &database_name "default"
911
collection_name: &collection_name "default"
1012
data: []

src/test/spec/json/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

src/test/spec/json/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ runOn:
55
# Skip QEv2 (also referred to as FLE2v2) tests on Serverless. Unskip once Serverless enables the QEv2 protocol.
66
# FLE 2 Encrypted collections are not supported on standalone.
77
topology: [ "replicaset", "sharded", "load-balanced" ]
8+
# Skip tests for "rangePreview" algorithm on Server 8.0+. Server 8.0 drops "rangePreview" and adds "range".
9+
maxServerVersion: "7.99.99"
810
database_name: &database_name "default"
911
collection_name: &collection_name "default"
1012
data: []

src/test/spec/json/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"replicaset",
77
"sharded",
88
"load-balanced"
9-
]
9+
],
10+
"maxServerVersion": "7.99.99"
1011
}
1112
],
1213
"database_name": "default",

0 commit comments

Comments
 (0)