Skip to content

Commit a10e61d

Browse files
GODRIVER-3161 [master] Resync the fle2v2-Range-* tests and skip prose test 22 (#1593)
Co-authored-by: Preston Vasquez <prestonvasquez@icloud.com>
1 parent b24ab57 commit a10e61d

File tree

86 files changed

+213
-84
lines changed

Some content is hidden

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

86 files changed

+213
-84
lines changed

testdata/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",

testdata/client-side-encryption/legacy/fle2v2-Range-Date-Aggregate.yml

Lines changed: 3 additions & 1 deletion
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: []
@@ -238,4 +240,4 @@ tests:
238240
}
239241
}
240242
]
241-
}
243+
}

testdata/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",

testdata/client-side-encryption/legacy/fle2v2-Range-Date-Correctness.yml

Lines changed: 3 additions & 1 deletion
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: []
@@ -419,4 +421,4 @@ tests:
419421
filter: { encryptedDate: { $gte: { $numberDouble: "0" } }}
420422
result:
421423
# expect an error mongocryptd.
422-
errorContains: "value type is a date"
424+
errorContains: "value type is a date"

testdata/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",

testdata/client-side-encryption/legacy/fle2v2-Range-Date-Delete.yml

Lines changed: 3 additions & 1 deletion
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: []
@@ -179,4 +181,4 @@ tests:
179181
}
180182
}
181183
]
182-
}
184+
}

testdata/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",

testdata/client-side-encryption/legacy/fle2v2-Range-Date-FindOneAndUpdate.yml

Lines changed: 3 additions & 1 deletion
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: []
@@ -236,4 +238,4 @@ tests:
236238
}
237239
}
238240
]
239-
}
241+
}

testdata/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",

testdata/client-side-encryption/legacy/fle2v2-Range-Date-InsertFind.yml

Lines changed: 3 additions & 1 deletion
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: []
@@ -232,4 +234,4 @@ tests:
232234
}
233235
}
234236
]
235-
}
237+
}

0 commit comments

Comments
 (0)