Skip to content

Commit 1ad0df0

Browse files
authored
PYTHON-3724 Remove null values from command_started_event in fle2v2-CreateCollection.yml (#1223)
1 parent c7e06e6 commit 1ad0df0

File tree

2 files changed

+0
-24
lines changed

2 files changed

+0
-24
lines changed

test/client-side-encryption/spec/legacy/fle2v2-CreateCollection.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@
158158
"command": {
159159
"create": "encryptedCollection",
160160
"encryptedFields": {
161-
"escCollection": null,
162-
"ecocCollection": null,
163-
"eccCollection": null,
164161
"fields": [
165162
{
166163
"path": "firstName",
@@ -343,9 +340,6 @@
343340
"command": {
344341
"create": "encryptedCollection",
345342
"encryptedFields": {
346-
"escCollection": null,
347-
"ecocCollection": null,
348-
"eccCollection": null,
349343
"fields": [
350344
{
351345
"path": "firstName",
@@ -851,9 +845,6 @@
851845
"command": {
852846
"create": "encryptedCollection",
853847
"encryptedFields": {
854-
"escCollection": null,
855-
"ecocCollection": null,
856-
"eccCollection": null,
857848
"fields": [
858849
{
859850
"path": "firstName",
@@ -1048,9 +1039,6 @@
10481039
"command": {
10491040
"create": "encryptedCollection",
10501041
"encryptedFields": {
1051-
"escCollection": null,
1052-
"ecocCollection": null,
1053-
"eccCollection": null,
10541042
"fields": [
10551043
{
10561044
"path": "firstName",
@@ -1367,9 +1355,6 @@
13671355
"command": {
13681356
"create": "encryptedCollection",
13691357
"encryptedFields": {
1370-
"escCollection": null,
1371-
"ecocCollection": null,
1372-
"eccCollection": null,
13731358
"fields": [
13741359
{
13751360
"path": "firstName",
@@ -1635,9 +1620,6 @@
16351620
"command": {
16361621
"create": "encryptedCollection",
16371622
"encryptedFields": {
1638-
"escCollection": null,
1639-
"ecocCollection": null,
1640-
"eccCollection": null,
16411623
"fields": [
16421624
{
16431625
"path": "firstName",

test/utils_spec_runner.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -430,12 +430,6 @@ def check_events(self, test, listener, session_ids):
430430
elif key not in actual:
431431
self.fail(f"Expected key [{key}] in {actual!r}")
432432
else:
433-
# Workaround an incorrect command started event in fle2v2-CreateCollection.yml
434-
# added in DRIVERS-2524.
435-
if key == "encryptedFields":
436-
for n in ("eccCollection", "ecocCollection", "escCollection"):
437-
if val.get(n) is None:
438-
val.pop(n, None)
439433
self.assertEqual(
440434
val, decode_raw(actual[key]), f"Key [{key}] in {actual}"
441435
)

0 commit comments

Comments
 (0)