diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml index e7a39fa39..2db3b43e7 100644 --- a/.github/workflows/zizmor.yml +++ b/.github/workflows/zizmor.yml @@ -18,4 +18,4 @@ jobs: with: persist-credentials: false - name: Run zizmor 🌈 - uses: zizmorcore/zizmor-action@7f2abfff7488a44086dba64ed2f5a9b431508079 + uses: zizmorcore/zizmor-action@a016d81e77496751b5c04eb1e8f00214bd396553 diff --git a/pyproject.toml b/pyproject.toml index 111136d08..53025cc3f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -55,7 +55,7 @@ gevent = ["gevent", "cffi>=2.0.0b1;python_version=='3.14'"] eventlet = ["eventlet"] coverage = [ "pytest-cov", - "coverage>=5,<=7.10.5" + "coverage>=5,<=7.10.6" ] mockupdb = [ "mockupdb@git+https://github.com/mongodb-labs/mongo-mockup-db@master" diff --git a/test/asynchronous/test_encryption.py b/test/asynchronous/test_encryption.py index 337dba0f6..4517c9f91 100644 --- a/test/asynchronous/test_encryption.py +++ b/test/asynchronous/test_encryption.py @@ -1268,7 +1268,7 @@ class TestBsonSizeBatches(AsyncEncryptionIntegrationTest): with self.assertRaises(BulkWriteError) as ctx: await self.coll_encrypted.bulk_write([InsertOne(doc)]) err = ctx.exception.details["writeErrors"][0] - self.assertEqual(2, err["code"]) + self.assertIn(err["code"], [2, 10334]) self.assertIn("object to insert too large", err["errmsg"]) diff --git a/test/asynchronous/unified_format.py b/test/asynchronous/unified_format.py index 9bd0fabdb..cc8f58477 100644 --- a/test/asynchronous/unified_format.py +++ b/test/asynchronous/unified_format.py @@ -157,7 +157,9 @@ async def is_run_on_requirement_satisfied(requirement): csfle_satisfied = True req_csfle = requirement.get("csfle") if req_csfle is True: - min_version_satisfied = Version.from_string("4.2") <= server_version + # Don't overwrite unsatisfied minimum version requirements. + if min_version_satisfied: + min_version_satisfied = Version.from_string("4.2") <= server_version csfle_satisfied = _HAVE_PYMONGOCRYPT and min_version_satisfied elif isinstance(req_csfle, dict) and "minLibmongocryptVersion" in req_csfle: csfle_satisfied = False @@ -1030,7 +1032,7 @@ class UnifiedSpecTestMixinV1(AsyncIntegrationTest): raise else: if expect_error: - self.fail(f'Excepted error {expect_error} but "{opname}" succeeded: {result}') + self.fail(f'Expected error {expect_error} but "{opname}" succeeded: {result}') if expect_result: actual = coerce_result(opname, result) diff --git a/test/test_encryption.py b/test/test_encryption.py index 46d8c785c..fb18cc2dd 100644 --- a/test/test_encryption.py +++ b/test/test_encryption.py @@ -1264,7 +1264,7 @@ class TestBsonSizeBatches(EncryptionIntegrationTest): with self.assertRaises(BulkWriteError) as ctx: self.coll_encrypted.bulk_write([InsertOne(doc)]) err = ctx.exception.details["writeErrors"][0] - self.assertEqual(2, err["code"]) + self.assertIn(err["code"], [2, 10334]) self.assertIn("object to insert too large", err["errmsg"]) diff --git a/test/unified_format.py b/test/unified_format.py index bc21464ab..8945948e6 100644 --- a/test/unified_format.py +++ b/test/unified_format.py @@ -156,7 +156,9 @@ def is_run_on_requirement_satisfied(requirement): csfle_satisfied = True req_csfle = requirement.get("csfle") if req_csfle is True: - min_version_satisfied = Version.from_string("4.2") <= server_version + # Don't overwrite unsatisfied minimum version requirements. + if min_version_satisfied: + min_version_satisfied = Version.from_string("4.2") <= server_version csfle_satisfied = _HAVE_PYMONGOCRYPT and min_version_satisfied elif isinstance(req_csfle, dict) and "minLibmongocryptVersion" in req_csfle: csfle_satisfied = False @@ -1021,7 +1023,7 @@ class UnifiedSpecTestMixinV1(IntegrationTest): raise else: if expect_error: - self.fail(f'Excepted error {expect_error} but "{opname}" succeeded: {result}') + self.fail(f'Expected error {expect_error} but "{opname}" succeeded: {result}') if expect_result: actual = coerce_result(opname, result)