PYTHON-1995 Resync encryption spec tests to 71518175e8bd5ee36fc35a7529b65f9d248b1c83

ShaneHarvey · ShaneHarvey · commit efb89583f33a · 2019-10-04T14:47:12.000-07:00
diff --git a/test/client-side-encryption/spec/bulk.json b/test/client-side-encryption/spec/bulk.json
@@ -148,16 +148,8 @@
                 "name": "deleteOne",
                 "arguments": {
                   "filter": {
-                    "$and": [
-                      {
-                        "encrypted_string": "string1"
-                      },
-                      {
-                        "_id": {
-                          "$eq": 2
-                        }
-                      }
-                    ]
+                    "encrypted_string": "string1",
+                    "_id": 2
                   }
                 }
               }
diff --git a/test/client-side-encryption/spec/getMore.json b/test/client-side-encryption/spec/getMore.json
@@ -142,7 +142,7 @@
             "batchSize": 2,
             "filter": {}
           },
-          "results": [
+          "result": [
             {
               "_id": 1,
               "encrypted_string": "string0"
diff --git a/test/client-side-encryption/spec/malformedCiphertext.json b/test/client-side-encryption/spec/malformedCiphertext.json
@@ -312,7 +312,7 @@
             }
           },
           "result": {
-            "errorContains": "did not provide all keys"
+            "errorContains": "not all keys requested were satisfied"
           }
         }
       ]
diff --git a/test/client-side-encryption/spec/missingKey.json b/test/client-side-encryption/spec/missingKey.json
@@ -119,7 +119,7 @@
             }
           },
           "result": {
-            "errorContains": "did not provide all keys"
+            "errorContains": "not all keys requested were satisfied"
           }
         }
       ],

Original file line number	Diff line number	Diff line change
`@@ -148,16 +148,8 @@`
`148`	`148`	`"name": "deleteOne",`
`149`	`149`	`"arguments": {`
`150`	`150`	`"filter": {`
`151`		`- "$and": [`
`152`		`- {`
`153`		`- "encrypted_string": "string1"`
`154`		`- },`
`155`		`- {`
`156`		`- "_id": {`
`157`		`- "$eq": 2`
`158`		`- }`
`159`		`- }`
`160`		`- ]`
	`151`	`+ "encrypted_string": "string1",`
	`152`	`+ "_id": 2`
`161`	`153`	`}`
`162`	`154`	`}`
`163`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@`
`142`	`142`	`"batchSize": 2,`
`143`	`143`	`"filter": {}`
`144`	`144`	`},`
`145`		`- "results": [`
	`145`	`+ "result": [`
`146`	`146`	`{`
`147`	`147`	`"_id": 1,`
`148`	`148`	`"encrypted_string": "string0"`
Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@`
`312`	`312`	`}`
`313`	`313`	`},`
`314`	`314`	`"result": {`
`315`		`- "errorContains": "did not provide all keys"`
	`315`	`+ "errorContains": "not all keys requested were satisfied"`
`316`	`316`	`}`
`317`	`317`	`}`
`318`	`318`	`]`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@`
`119`	`119`	`}`
`120`	`120`	`},`
`121`	`121`	`"result": {`
`122`		`- "errorContains": "did not provide all keys"`
	`122`	`+ "errorContains": "not all keys requested were satisfied"`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`],`