Merge branch 'master' of github.com:mongodb/mongo-python-driver
This commit is contained in:
commit
752997930c
2
.github/workflows/zizmor.yml
vendored
2
.github/workflows/zizmor.yml
vendored
@ -18,4 +18,4 @@ jobs:
|
||||
with:
|
||||
persist-credentials: false
|
||||
- name: Run zizmor 🌈
|
||||
uses: zizmorcore/zizmor-action@7f2abfff7488a44086dba64ed2f5a9b431508079
|
||||
uses: zizmorcore/zizmor-action@a016d81e77496751b5c04eb1e8f00214bd396553
|
||||
|
||||
@ -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"
|
||||
|
||||
@ -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"])
|
||||
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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"])
|
||||
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user