fix all but one test

Author: blink1073

.evergreen/spec-patch/PYTHON-XXXX.patch

@@ -0,0 +1,52 @@
+diff --git a/test/client-side-encryption/spec/unified/updateOne.json b/test/client-side-encryption/spec/unified/updateOne.json
+index a059b07c4..6c8fdcbb6 100644
+--- a/test/client-side-encryption/spec/unified/updateOne.json
++++ b/test/client-side-encryption/spec/unified/updateOne.json
+@@ -396,6 +396,12 @@
+                         "$unset": {
+                           "encrypted_string": ""
+                         }
++                      },
++                      "multi": {
++                        "$$unsetOrMatches": false
++                      },
++                      "upsert": {
++                        "$$unsetOrMatches": false
+                       }
+                     }
+                   ],
+@@ -472,6 +478,12 @@
+                         "$rename": {
+                           "encrypted_string": "encrypted_string_equivalent"
+                         }
++                      },
++                      "multi": {
++                        "$$unsetOrMatches": false
++                      },
++                      "upsert": {
++                        "$$unsetOrMatches": false
+                       }
+                     }
+                   ],
+diff --git a/test/client-side-encryption/spec/unified/timeoutMS.json b/test/client-side-encryption/spec/unified/timeoutMS.json
+index 399c57df6..98dc50e98 100644
+--- a/test/client-side-encryption/spec/unified/timeoutMS.json
++++ b/test/client-side-encryption/spec/unified/timeoutMS.json
+@@ -196,7 +196,7 @@
+             }
+           },
+           "object": "coll",
+-          "expectResult": {
++          "expectError": {
+             "isTimeoutError": true
+           }
+         }
+@@ -260,7 +260,7 @@
+             }
+           },
+           "object": "coll",
+-          "expectResult": {
++          "expectError": {
+             "isTimeoutError": true
+           }
+         }

test/asynchronous/test_encryption.py

@@ -747,8 +747,7 @@ async def run_scenario(self):
 if _HAVE_PYMONGOCRYPT:
     globals().update(
         generate_test_classes(
-            os.path.join(SPEC_PATH, "unified"),
-            module=__name__,
+            os.path.join(SPEC_PATH, "unified"), module=__name__, expected_failures=["mapReduce .*"]
         )
     )
 

test/client-side-encryption/spec/unified/timeoutMS.json

@@ -196,7 +196,7 @@
             }
           },
           "object": "coll",
-          "expectResult": {
+          "expectError": {
             "isTimeoutError": true
           }
         }
@@ -260,7 +260,7 @@
             }
           },
           "object": "coll",
-          "expectResult": {
+          "expectError": {
             "isTimeoutError": true
           }
         }

test/test_encryption.py

@@ -745,8 +745,7 @@ def run_scenario(self):
 if _HAVE_PYMONGOCRYPT:
     globals().update(
         generate_test_classes(
-            os.path.join(SPEC_PATH, "unified"),
-            module=__name__,
+            os.path.join(SPEC_PATH, "unified"), module=__name__, expected_failures=["mapReduce .*"]
         )
     )