From 6f77e99c5a41233d4789c4c8090af78e6e6dcc80 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Wed, 3 Sep 2025 12:12:33 -0400 Subject: [PATCH] PYTHON-5524 - Fix CSFLE spec test min version checks --- test/asynchronous/unified_format.py | 4 +++- test/unified_format.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/asynchronous/unified_format.py b/test/asynchronous/unified_format.py index 9bd0fabdb8..b10879733b 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 diff --git a/test/unified_format.py b/test/unified_format.py index bc21464ab6..1d47f747d3 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