Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion bindings/python/.evergreen/integ-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,17 @@ else
fi
export PYMONGOCRYPT_LIB

createvirtualenv $PYTHON .venv
# PyMongo master requires Python 3.11+ (PYTHON-6138). Provision a modern
# Python interpreter with uv if the toolchain Python is too old.
if "$PYTHON" -c 'import sys; sys.exit(0 if sys.version_info >= (3, 11) else 1)'; then
createvirtualenv $PYTHON .venv
else
. "$DRIVERS_TOOLS/.evergreen/ensure-uv.sh"
ensure_uv
uv python install 3.13
uv venv --seed --python 3.13 .venv
. .venv/bin/activate
fi
pip install -e .
pip install uv
pushd $PYMONGO_DIR
Expand Down
67 changes: 32 additions & 35 deletions bindings/python/test/test_mongocrypt.py
Original file line number Diff line number Diff line change
Expand Up @@ -1064,8 +1064,9 @@ async def test_textPreview_query_fails(self):
)

async def test_deprecated_preview_query_types(self):
# The "*Preview" query types remain as aliases to the GA names.
# PYTHON-5959 drops them.
# The "*Preview" query types are deprecated aliases of the GA names.
# libmongocrypt rejects them (MONGOCRYPT-938); PYTHON-5959 drops
# them from the driver API.
key_path = "keys/ABCDEFAB123498761234123456789012-local-document.json"
key_id = json_data(key_path)["_id"]
encrypter = AsyncExplicitEncrypter(
Expand All @@ -1076,25 +1077,21 @@ async def test_deprecated_preview_query_types(self):
)
self.addCleanup(encrypter.close)

string_opts = bson_data("fle2-text-search/textopts.json")
value = bson.encode({"v": "foo"})

async def encrypt(query_type):
return await encrypter.encrypt(
value,
"string",
key_id=key_id,
query_type=query_type,
contention_factor=0,
string_opts=string_opts,
)

for query_type in ["prefix", "suffix", "substring"]:
with self.subTest(query_type=query_type):
self.assertEqual(
await encrypt(f"{query_type}Preview"),
await encrypt(query_type),
)
with self.assertRaisesRegex(
MongoCryptError,
f"Query type '{query_type}Preview' is deprecated, "
f"please use '{query_type}'",
):
await encrypter.encrypt(
bson.encode({"v": "foo"}),
"string",
key_id=key_id,
query_type=f"{query_type}Preview",
contention_factor=0,
string_opts=bson_data("fle2-text-search/textopts.json"),
)


class TestNeedKMSAzureCredentials(unittest.TestCase):
Expand Down Expand Up @@ -1591,8 +1588,9 @@ def test_textPreview_query_fails(self):
)

def test_deprecated_preview_query_types(self):
# The "*Preview" query types remain as aliases to the GA names.
# PYTHON-5959 drops them.
# The "*Preview" query types are deprecated aliases of the GA names.
# libmongocrypt rejects them (MONGOCRYPT-938); PYTHON-5959 drops
# them from the driver API.
key_path = "keys/ABCDEFAB123498761234123456789012-local-document.json"
key_id = json_data(key_path)["_id"]
encrypter = ExplicitEncrypter(
Expand All @@ -1603,22 +1601,21 @@ def test_deprecated_preview_query_types(self):
)
self.addCleanup(encrypter.close)

string_opts = bson_data("fle2-text-search/textopts.json")
value = bson.encode({"v": "foo"})

def encrypt(query_type):
return encrypter.encrypt(
value,
"string",
key_id=key_id,
query_type=query_type,
contention_factor=0,
string_opts=string_opts,
)

for query_type in ["prefix", "suffix", "substring"]:
with self.subTest(query_type=query_type):
self.assertEqual(encrypt(f"{query_type}Preview"), encrypt(query_type))
with self.assertRaisesRegex(
MongoCryptError,
f"Query type '{query_type}Preview' is deprecated, "
f"please use '{query_type}'",
):
encrypter.encrypt(
bson.encode({"v": "foo"}),
"string",
key_id=key_id,
query_type=f"{query_type}Preview",
contention_factor=0,
string_opts=bson_data("fle2-text-search/textopts.json"),
)


def read(filename, **kwargs):
Expand Down
Loading