PYTHON-3221 Resync CSFLE spec tests (#929)

mongodb · Apr 13, 2022 · ff288fa · ff288fa
1 parent a319075
commit ff288fa
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/.evergreen/resync-specs.sh b/.evergreen/resync-specs.sh
@@ -81,6 +81,12 @@ do
     change*streams)
       cpjson change-streams/tests/ change_streams/
       ;;
+    client-side-encryption|csfle|fle)
+      cpjson client-side-encryption/tests/ client-side-encryption/spec
+      cpjson client-side-encryption/corpus/ client-side-encryption/corpus
+      cpjson client-side-encryption/external/ client-side-encryption/external
+      cpjson client-side-encryption/limits/ client-side-encryption/limits
+      ;;
     cmap|CMAP)
       cpjson connection-monitoring-and-pooling/tests cmap
       rm $PYMONGO/test/cmap/wait-queue-fairness.json  # PYTHON-1873

diff --git a/test/client-side-encryption/spec/badQueries.json b/test/client-side-encryption/spec/badQueries.json
@@ -1318,7 +1318,7 @@
             }
           },
           "result": {
-            "errorContains": "Cannot encrypt element of type array"
+            "errorContains": "Cannot encrypt element of type"
           }
         }
       ]
@@ -1387,7 +1387,7 @@
             }
           },
           "result": {
-            "errorContains": "Cannot encrypt element of type array"
+            "errorContains": "Cannot encrypt element of type"
           }
         }
       ]

diff --git a/test/client-side-encryption/spec/types.json b/test/client-side-encryption/spec/types.json
@@ -504,7 +504,7 @@
             }
           },
           "result": {
-            "errorContains": "Cannot use deterministic encryption for element of type: double"
+            "errorContains": "element of type: double"
           }
         }
       ]
@@ -551,7 +551,7 @@
             }
           },
           "result": {
-            "errorContains": "Cannot use deterministic encryption for element of type: decimal"
+            "errorContains": "element of type: decimal"
           }
         }
       ]
@@ -883,7 +883,7 @@
             }
           },
           "result": {
-            "errorContains": "Cannot use deterministic encryption for element of type: javascriptWithScope"
+            "errorContains": "element of type: javascriptWithScope"
           }
         }
       ]
@@ -928,7 +928,7 @@
             }
           },
           "result": {
-            "errorContains": "Cannot use deterministic encryption for element of type: object"
+            "errorContains": "element of type: object"
           }
         }
       ]
@@ -1547,7 +1547,7 @@
             }
           },
           "result": {
-            "errorContains": "Cannot use deterministic encryption for element of type: array"
+            "errorContains": "element of type: array"
           }
         }
       ]
@@ -1592,7 +1592,7 @@
             }
           },
           "result": {
-            "errorContains": "Cannot use deterministic encryption for element of type: bool"
+            "errorContains": "element of type: bool"
           }
         }
       ]

diff --git a/test/test_encryption.py b/test/test_encryption.py
@@ -815,11 +815,7 @@ def run_test(self, provider_name):
         self.assertEqual(encrypted_altname, encrypted)
 
         # Explicitly encrypting an auto encrypted field.
-        msg = (
-            r"Cannot encrypt element of type binData because schema "
-            r"requires that type is one of: \[ string \]"
-        )
-        with self.assertRaisesRegex(EncryptionError, msg):
+        with self.assertRaisesRegex(EncryptionError, r"encrypt element of type"):
             self.client_encrypted.db.coll.insert_one({"encrypted_placeholder": encrypted})
 
     def test_data_key_local(self):