Skip to content

Commit 53da94d

Browse files
committed
close clients and fix changelog
1 parent 8c45daa commit 53da94d

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

doc/changelog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PyMongo 4.12 brings a number of changes including:
88

99
- Support for configuring DEK cache lifetime via the ``key_expiration_ms`` argument to
1010
:class:`~pymongo.encryption_options.AutoEncryptionOpts`.
11-
- Support for $lookup in CSFLE and QE.pr
11+
- Support for $lookup in CSFLE and QE supported on MongoDB 8.1+.
1212

1313
Issues Resolved
1414
...............

test/asynchronous/test_encryption.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2472,6 +2472,9 @@ async def asyncSetUp(self):
24722472
await encrypted_client.db.no_schema.insert_one({"no_schema": "no_schema"})
24732473
await encrypted_client.db.no_schema2.insert_one({"no_schema2": "no_schema2"})
24742474

2475+
await encrypted_client.close()
2476+
await unencrypted_client.close()
2477+
24752478
@async_client_context.require_version_min(8, 1, -1)
24762479
async def test_1_csfle_joins_no_schema(self):
24772480
encrypted_client = await self.async_rs_or_single_client(
@@ -2499,6 +2502,7 @@ async def test_1_csfle_joins_no_schema(self):
24992502
)
25002503
)
25012504
self.assertEqual(doc, {"csfle": "csfle", "matched": [{"no_schema": "no_schema"}]})
2505+
await encrypted_client.close()
25022506

25032507
@async_client_context.require_version_min(8, 1, -1)
25042508
async def test_2_qe_joins_no_schema(self):
@@ -2527,6 +2531,7 @@ async def test_2_qe_joins_no_schema(self):
25272531
)
25282532
)
25292533
self.assertEqual(doc, {"qe": "qe", "matched": [{"no_schema": "no_schema"}]})
2534+
await encrypted_client.close()
25302535

25312536
@async_client_context.require_version_min(8, 1, -1)
25322537
async def test_3_no_schema_joins_csfle(self):
@@ -2552,6 +2557,7 @@ async def test_3_no_schema_joins_csfle(self):
25522557
)
25532558
)
25542559
self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"csfle": "csfle"}]})
2560+
await encrypted_client.close()
25552561

25562562
@async_client_context.require_version_min(8, 1, -1)
25572563
async def test_4_no_schema_joins_qe(self):
@@ -2580,6 +2586,7 @@ async def test_4_no_schema_joins_qe(self):
25802586
)
25812587
)
25822588
self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"qe": "qe"}]})
2589+
await encrypted_client.close()
25832590

25842591
@async_client_context.require_version_min(8, 1, -1)
25852592
async def test_5_csfle_joins_csfle2(self):
@@ -2608,6 +2615,7 @@ async def test_5_csfle_joins_csfle2(self):
26082615
)
26092616
)
26102617
self.assertEqual(doc, {"csfle": "csfle", "matched": [{"csfle2": "csfle2"}]})
2618+
await encrypted_client.close()
26112619

26122620
@async_client_context.require_version_min(8, 1, -1)
26132621
async def test_6_qe_joins_qe2(self):
@@ -2636,6 +2644,7 @@ async def test_6_qe_joins_qe2(self):
26362644
)
26372645
)
26382646
self.assertEqual(doc, {"qe": "qe", "matched": [{"qe2": "qe2"}]})
2647+
await encrypted_client.close()
26392648

26402649
@async_client_context.require_version_min(8, 1, -1)
26412650
async def test_7_no_schema_joins_no_schema2(self):
@@ -2664,6 +2673,7 @@ async def test_7_no_schema_joins_no_schema2(self):
26642673
)
26652674
)
26662675
self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"no_schema2": "no_schema2"}]})
2676+
await encrypted_client.close()
26672677

26682678
@async_client_context.require_version_min(8, 1, -1)
26692679
async def test_8_csfle_joins_qe(self):
@@ -2690,6 +2700,7 @@ async def test_8_csfle_joins_qe(self):
26902700
)
26912701
)
26922702
self.assertTrue("not supported" in str(exc))
2703+
await encrypted_client.close()
26932704

26942705
@async_client_context.require_version_max(8, 1, -1)
26952706
async def test_9_error(self):
@@ -2719,6 +2730,7 @@ async def test_9_error(self):
27192730
)
27202731
)
27212732
self.assertTrue("Upgrade" in str(exc))
2733+
await encrypted_client.close()
27222734

27232735

27242736
# https://github.com/mongodb/specifications/blob/072601/source/client-side-encryption/tests/README.md#rewrap

test/test_encryption.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2456,6 +2456,9 @@ def setUp(self):
24562456
encrypted_client.db.no_schema.insert_one({"no_schema": "no_schema"})
24572457
encrypted_client.db.no_schema2.insert_one({"no_schema2": "no_schema2"})
24582458

2459+
encrypted_client.close()
2460+
unencrypted_client.close()
2461+
24592462
@client_context.require_version_min(8, 1, -1)
24602463
def test_1_csfle_joins_no_schema(self):
24612464
encrypted_client = self.rs_or_single_client(
@@ -2483,6 +2486,7 @@ def test_1_csfle_joins_no_schema(self):
24832486
)
24842487
)
24852488
self.assertEqual(doc, {"csfle": "csfle", "matched": [{"no_schema": "no_schema"}]})
2489+
encrypted_client.close()
24862490

24872491
@client_context.require_version_min(8, 1, -1)
24882492
def test_2_qe_joins_no_schema(self):
@@ -2511,6 +2515,7 @@ def test_2_qe_joins_no_schema(self):
25112515
)
25122516
)
25132517
self.assertEqual(doc, {"qe": "qe", "matched": [{"no_schema": "no_schema"}]})
2518+
encrypted_client.close()
25142519

25152520
@client_context.require_version_min(8, 1, -1)
25162521
def test_3_no_schema_joins_csfle(self):
@@ -2536,6 +2541,7 @@ def test_3_no_schema_joins_csfle(self):
25362541
)
25372542
)
25382543
self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"csfle": "csfle"}]})
2544+
encrypted_client.close()
25392545

25402546
@client_context.require_version_min(8, 1, -1)
25412547
def test_4_no_schema_joins_qe(self):
@@ -2564,6 +2570,7 @@ def test_4_no_schema_joins_qe(self):
25642570
)
25652571
)
25662572
self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"qe": "qe"}]})
2573+
encrypted_client.close()
25672574

25682575
@client_context.require_version_min(8, 1, -1)
25692576
def test_5_csfle_joins_csfle2(self):
@@ -2592,6 +2599,7 @@ def test_5_csfle_joins_csfle2(self):
25922599
)
25932600
)
25942601
self.assertEqual(doc, {"csfle": "csfle", "matched": [{"csfle2": "csfle2"}]})
2602+
encrypted_client.close()
25952603

25962604
@client_context.require_version_min(8, 1, -1)
25972605
def test_6_qe_joins_qe2(self):
@@ -2620,6 +2628,7 @@ def test_6_qe_joins_qe2(self):
26202628
)
26212629
)
26222630
self.assertEqual(doc, {"qe": "qe", "matched": [{"qe2": "qe2"}]})
2631+
encrypted_client.close()
26232632

26242633
@client_context.require_version_min(8, 1, -1)
26252634
def test_7_no_schema_joins_no_schema2(self):
@@ -2648,6 +2657,7 @@ def test_7_no_schema_joins_no_schema2(self):
26482657
)
26492658
)
26502659
self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"no_schema2": "no_schema2"}]})
2660+
encrypted_client.close()
26512661

26522662
@client_context.require_version_min(8, 1, -1)
26532663
def test_8_csfle_joins_qe(self):
@@ -2674,6 +2684,7 @@ def test_8_csfle_joins_qe(self):
26742684
)
26752685
)
26762686
self.assertTrue("not supported" in str(exc))
2687+
encrypted_client.close()
26772688

26782689
@client_context.require_version_max(8, 1, -1)
26792690
def test_9_error(self):
@@ -2703,6 +2714,7 @@ def test_9_error(self):
27032714
)
27042715
)
27052716
self.assertTrue("Upgrade" in str(exc))
2717+
encrypted_client.close()
27062718

27072719

27082720
# https://github.com/mongodb/specifications/blob/072601/source/client-side-encryption/tests/README.md#rewrap

0 commit comments

Comments
 (0)