close clients and fix changelog

sleepyStick · sleepyStick · commit 53da94dae2a4 · 2025-03-19T16:50:56.000-07:00
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -8,7 +8,7 @@ PyMongo 4.12 brings a number of changes including:
 
 - Support for configuring DEK cache lifetime via the ``key_expiration_ms`` argument to
   :class:`~pymongo.encryption_options.AutoEncryptionOpts`.
-- Support for $lookup in CSFLE and QE.pr
+- Support for $lookup in CSFLE and QE supported on MongoDB 8.1+.
 
 Issues Resolved
 ...............
diff --git a/test/asynchronous/test_encryption.py b/test/asynchronous/test_encryption.py
@@ -2472,6 +2472,9 @@ async def asyncSetUp(self):
         await encrypted_client.db.no_schema.insert_one({"no_schema": "no_schema"})
         await encrypted_client.db.no_schema2.insert_one({"no_schema2": "no_schema2"})
 
+        await encrypted_client.close()
+        await unencrypted_client.close()
+
     @async_client_context.require_version_min(8, 1, -1)
     async def test_1_csfle_joins_no_schema(self):
         encrypted_client = await self.async_rs_or_single_client(
@@ -2499,6 +2502,7 @@ async def test_1_csfle_joins_no_schema(self):
             )
         )
         self.assertEqual(doc, {"csfle": "csfle", "matched": [{"no_schema": "no_schema"}]})
+        await encrypted_client.close()
 
     @async_client_context.require_version_min(8, 1, -1)
     async def test_2_qe_joins_no_schema(self):
@@ -2527,6 +2531,7 @@ async def test_2_qe_joins_no_schema(self):
             )
         )
         self.assertEqual(doc, {"qe": "qe", "matched": [{"no_schema": "no_schema"}]})
+        await encrypted_client.close()
 
     @async_client_context.require_version_min(8, 1, -1)
     async def test_3_no_schema_joins_csfle(self):
@@ -2552,6 +2557,7 @@ async def test_3_no_schema_joins_csfle(self):
             )
         )
         self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"csfle": "csfle"}]})
+        await encrypted_client.close()
 
     @async_client_context.require_version_min(8, 1, -1)
     async def test_4_no_schema_joins_qe(self):
@@ -2580,6 +2586,7 @@ async def test_4_no_schema_joins_qe(self):
             )
         )
         self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"qe": "qe"}]})
+        await encrypted_client.close()
 
     @async_client_context.require_version_min(8, 1, -1)
     async def test_5_csfle_joins_csfle2(self):
@@ -2608,6 +2615,7 @@ async def test_5_csfle_joins_csfle2(self):
             )
         )
         self.assertEqual(doc, {"csfle": "csfle", "matched": [{"csfle2": "csfle2"}]})
+        await encrypted_client.close()
 
     @async_client_context.require_version_min(8, 1, -1)
     async def test_6_qe_joins_qe2(self):
@@ -2636,6 +2644,7 @@ async def test_6_qe_joins_qe2(self):
             )
         )
         self.assertEqual(doc, {"qe": "qe", "matched": [{"qe2": "qe2"}]})
+        await encrypted_client.close()
 
     @async_client_context.require_version_min(8, 1, -1)
     async def test_7_no_schema_joins_no_schema2(self):
@@ -2664,6 +2673,7 @@ async def test_7_no_schema_joins_no_schema2(self):
             )
         )
         self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"no_schema2": "no_schema2"}]})
+        await encrypted_client.close()
 
     @async_client_context.require_version_min(8, 1, -1)
     async def test_8_csfle_joins_qe(self):
@@ -2690,6 +2700,7 @@ async def test_8_csfle_joins_qe(self):
                 )
             )
             self.assertTrue("not supported" in str(exc))
+        await encrypted_client.close()
 
     @async_client_context.require_version_max(8, 1, -1)
     async def test_9_error(self):
@@ -2719,6 +2730,7 @@ async def test_9_error(self):
                 )
             )
             self.assertTrue("Upgrade" in str(exc))
+        await encrypted_client.close()
 
 
 # https://github.com/mongodb/specifications/blob/072601/source/client-side-encryption/tests/README.md#rewrap
diff --git a/test/test_encryption.py b/test/test_encryption.py
@@ -2456,6 +2456,9 @@ def setUp(self):
         encrypted_client.db.no_schema.insert_one({"no_schema": "no_schema"})
         encrypted_client.db.no_schema2.insert_one({"no_schema2": "no_schema2"})
 
+        encrypted_client.close()
+        unencrypted_client.close()
+
     @client_context.require_version_min(8, 1, -1)
     def test_1_csfle_joins_no_schema(self):
         encrypted_client = self.rs_or_single_client(
@@ -2483,6 +2486,7 @@ def test_1_csfle_joins_no_schema(self):
             )
         )
         self.assertEqual(doc, {"csfle": "csfle", "matched": [{"no_schema": "no_schema"}]})
+        encrypted_client.close()
 
     @client_context.require_version_min(8, 1, -1)
     def test_2_qe_joins_no_schema(self):
@@ -2511,6 +2515,7 @@ def test_2_qe_joins_no_schema(self):
             )
         )
         self.assertEqual(doc, {"qe": "qe", "matched": [{"no_schema": "no_schema"}]})
+        encrypted_client.close()
 
     @client_context.require_version_min(8, 1, -1)
     def test_3_no_schema_joins_csfle(self):
@@ -2536,6 +2541,7 @@ def test_3_no_schema_joins_csfle(self):
             )
         )
         self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"csfle": "csfle"}]})
+        encrypted_client.close()
 
     @client_context.require_version_min(8, 1, -1)
     def test_4_no_schema_joins_qe(self):
@@ -2564,6 +2570,7 @@ def test_4_no_schema_joins_qe(self):
             )
         )
         self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"qe": "qe"}]})
+        encrypted_client.close()
 
     @client_context.require_version_min(8, 1, -1)
     def test_5_csfle_joins_csfle2(self):
@@ -2592,6 +2599,7 @@ def test_5_csfle_joins_csfle2(self):
             )
         )
         self.assertEqual(doc, {"csfle": "csfle", "matched": [{"csfle2": "csfle2"}]})
+        encrypted_client.close()
 
     @client_context.require_version_min(8, 1, -1)
     def test_6_qe_joins_qe2(self):
@@ -2620,6 +2628,7 @@ def test_6_qe_joins_qe2(self):
             )
         )
         self.assertEqual(doc, {"qe": "qe", "matched": [{"qe2": "qe2"}]})
+        encrypted_client.close()
 
     @client_context.require_version_min(8, 1, -1)
     def test_7_no_schema_joins_no_schema2(self):
@@ -2648,6 +2657,7 @@ def test_7_no_schema_joins_no_schema2(self):
             )
         )
         self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"no_schema2": "no_schema2"}]})
+        encrypted_client.close()
 
     @client_context.require_version_min(8, 1, -1)
     def test_8_csfle_joins_qe(self):
@@ -2674,6 +2684,7 @@ def test_8_csfle_joins_qe(self):
                 )
             )
             self.assertTrue("not supported" in str(exc))
+        encrypted_client.close()
 
     @client_context.require_version_max(8, 1, -1)
     def test_9_error(self):
@@ -2703,6 +2714,7 @@ def test_9_error(self):
                 )
             )
             self.assertTrue("Upgrade" in str(exc))
+        encrypted_client.close()
 
 
 # https://github.com/mongodb/specifications/blob/072601/source/client-side-encryption/tests/README.md#rewrap

Original file line number	Diff line number	Diff line change
`@@ -2472,6 +2472,9 @@ async def asyncSetUp(self):`
`2472`	`2472`	`await encrypted_client.db.no_schema.insert_one({"no_schema": "no_schema"})`
`2473`	`2473`	`await encrypted_client.db.no_schema2.insert_one({"no_schema2": "no_schema2"})`
`2474`	`2474`
	`2475`	`+ await encrypted_client.close()`
	`2476`	`+ await unencrypted_client.close()`
	`2477`	`+`
`2475`	`2478`	`@async_client_context.require_version_min(8, 1, -1)`
`2476`	`2479`	`async def test_1_csfle_joins_no_schema(self):`
`2477`	`2480`	`encrypted_client = await self.async_rs_or_single_client(`
`@@ -2499,6 +2502,7 @@ async def test_1_csfle_joins_no_schema(self):`
`2499`	`2502`	`)`
`2500`	`2503`	`)`
`2501`	`2504`	`self.assertEqual(doc, {"csfle": "csfle", "matched": [{"no_schema": "no_schema"}]})`
	`2505`	`+ await encrypted_client.close()`
`2502`	`2506`
`2503`	`2507`	`@async_client_context.require_version_min(8, 1, -1)`
`2504`	`2508`	`async def test_2_qe_joins_no_schema(self):`
`@@ -2527,6 +2531,7 @@ async def test_2_qe_joins_no_schema(self):`
`2527`	`2531`	`)`
`2528`	`2532`	`)`
`2529`	`2533`	`self.assertEqual(doc, {"qe": "qe", "matched": [{"no_schema": "no_schema"}]})`
	`2534`	`+ await encrypted_client.close()`
`2530`	`2535`
`2531`	`2536`	`@async_client_context.require_version_min(8, 1, -1)`
`2532`	`2537`	`async def test_3_no_schema_joins_csfle(self):`
`@@ -2552,6 +2557,7 @@ async def test_3_no_schema_joins_csfle(self):`
`2552`	`2557`	`)`
`2553`	`2558`	`)`
`2554`	`2559`	`self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"csfle": "csfle"}]})`
	`2560`	`+ await encrypted_client.close()`
`2555`	`2561`
`2556`	`2562`	`@async_client_context.require_version_min(8, 1, -1)`
`2557`	`2563`	`async def test_4_no_schema_joins_qe(self):`
`@@ -2580,6 +2586,7 @@ async def test_4_no_schema_joins_qe(self):`
`2580`	`2586`	`)`
`2581`	`2587`	`)`
`2582`	`2588`	`self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"qe": "qe"}]})`
	`2589`	`+ await encrypted_client.close()`
`2583`	`2590`
`2584`	`2591`	`@async_client_context.require_version_min(8, 1, -1)`
`2585`	`2592`	`async def test_5_csfle_joins_csfle2(self):`
`@@ -2608,6 +2615,7 @@ async def test_5_csfle_joins_csfle2(self):`
`2608`	`2615`	`)`
`2609`	`2616`	`)`
`2610`	`2617`	`self.assertEqual(doc, {"csfle": "csfle", "matched": [{"csfle2": "csfle2"}]})`
	`2618`	`+ await encrypted_client.close()`
`2611`	`2619`
`2612`	`2620`	`@async_client_context.require_version_min(8, 1, -1)`
`2613`	`2621`	`async def test_6_qe_joins_qe2(self):`
`@@ -2636,6 +2644,7 @@ async def test_6_qe_joins_qe2(self):`
`2636`	`2644`	`)`
`2637`	`2645`	`)`
`2638`	`2646`	`self.assertEqual(doc, {"qe": "qe", "matched": [{"qe2": "qe2"}]})`
	`2647`	`+ await encrypted_client.close()`
`2639`	`2648`
`2640`	`2649`	`@async_client_context.require_version_min(8, 1, -1)`
`2641`	`2650`	`async def test_7_no_schema_joins_no_schema2(self):`
`@@ -2664,6 +2673,7 @@ async def test_7_no_schema_joins_no_schema2(self):`
`2664`	`2673`	`)`
`2665`	`2674`	`)`
`2666`	`2675`	`self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"no_schema2": "no_schema2"}]})`
	`2676`	`+ await encrypted_client.close()`
`2667`	`2677`
`2668`	`2678`	`@async_client_context.require_version_min(8, 1, -1)`
`2669`	`2679`	`async def test_8_csfle_joins_qe(self):`
`@@ -2690,6 +2700,7 @@ async def test_8_csfle_joins_qe(self):`
`2690`	`2700`	`)`
`2691`	`2701`	`)`
`2692`	`2702`	`self.assertTrue("not supported" in str(exc))`
	`2703`	`+ await encrypted_client.close()`
`2693`	`2704`
`2694`	`2705`	`@async_client_context.require_version_max(8, 1, -1)`
`2695`	`2706`	`async def test_9_error(self):`
`@@ -2719,6 +2730,7 @@ async def test_9_error(self):`
`2719`	`2730`	`)`
`2720`	`2731`	`)`
`2721`	`2732`	`self.assertTrue("Upgrade" in str(exc))`
	`2733`	`+ await encrypted_client.close()`
`2722`	`2734`
`2723`	`2735`
`2724`	`2736`	`# https://github.com/mongodb/specifications/blob/072601/source/client-side-encryption/tests/README.md#rewrap`
Original file line number	Diff line number	Diff line change
`@@ -2456,6 +2456,9 @@ def setUp(self):`
`2456`	`2456`	`encrypted_client.db.no_schema.insert_one({"no_schema": "no_schema"})`
`2457`	`2457`	`encrypted_client.db.no_schema2.insert_one({"no_schema2": "no_schema2"})`
`2458`	`2458`
	`2459`	`+ encrypted_client.close()`
	`2460`	`+ unencrypted_client.close()`
	`2461`	`+`
`2459`	`2462`	`@client_context.require_version_min(8, 1, -1)`
`2460`	`2463`	`def test_1_csfle_joins_no_schema(self):`
`2461`	`2464`	`encrypted_client = self.rs_or_single_client(`
`@@ -2483,6 +2486,7 @@ def test_1_csfle_joins_no_schema(self):`
`2483`	`2486`	`)`
`2484`	`2487`	`)`
`2485`	`2488`	`self.assertEqual(doc, {"csfle": "csfle", "matched": [{"no_schema": "no_schema"}]})`
	`2489`	`+ encrypted_client.close()`
`2486`	`2490`
`2487`	`2491`	`@client_context.require_version_min(8, 1, -1)`
`2488`	`2492`	`def test_2_qe_joins_no_schema(self):`
`@@ -2511,6 +2515,7 @@ def test_2_qe_joins_no_schema(self):`
`2511`	`2515`	`)`
`2512`	`2516`	`)`
`2513`	`2517`	`self.assertEqual(doc, {"qe": "qe", "matched": [{"no_schema": "no_schema"}]})`
	`2518`	`+ encrypted_client.close()`
`2514`	`2519`
`2515`	`2520`	`@client_context.require_version_min(8, 1, -1)`
`2516`	`2521`	`def test_3_no_schema_joins_csfle(self):`
`@@ -2536,6 +2541,7 @@ def test_3_no_schema_joins_csfle(self):`
`2536`	`2541`	`)`
`2537`	`2542`	`)`
`2538`	`2543`	`self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"csfle": "csfle"}]})`
	`2544`	`+ encrypted_client.close()`
`2539`	`2545`
`2540`	`2546`	`@client_context.require_version_min(8, 1, -1)`
`2541`	`2547`	`def test_4_no_schema_joins_qe(self):`
`@@ -2564,6 +2570,7 @@ def test_4_no_schema_joins_qe(self):`
`2564`	`2570`	`)`
`2565`	`2571`	`)`
`2566`	`2572`	`self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"qe": "qe"}]})`
	`2573`	`+ encrypted_client.close()`
`2567`	`2574`
`2568`	`2575`	`@client_context.require_version_min(8, 1, -1)`
`2569`	`2576`	`def test_5_csfle_joins_csfle2(self):`
`@@ -2592,6 +2599,7 @@ def test_5_csfle_joins_csfle2(self):`
`2592`	`2599`	`)`
`2593`	`2600`	`)`
`2594`	`2601`	`self.assertEqual(doc, {"csfle": "csfle", "matched": [{"csfle2": "csfle2"}]})`
	`2602`	`+ encrypted_client.close()`
`2595`	`2603`
`2596`	`2604`	`@client_context.require_version_min(8, 1, -1)`
`2597`	`2605`	`def test_6_qe_joins_qe2(self):`
`@@ -2620,6 +2628,7 @@ def test_6_qe_joins_qe2(self):`
`2620`	`2628`	`)`
`2621`	`2629`	`)`
`2622`	`2630`	`self.assertEqual(doc, {"qe": "qe", "matched": [{"qe2": "qe2"}]})`
	`2631`	`+ encrypted_client.close()`
`2623`	`2632`
`2624`	`2633`	`@client_context.require_version_min(8, 1, -1)`
`2625`	`2634`	`def test_7_no_schema_joins_no_schema2(self):`
`@@ -2648,6 +2657,7 @@ def test_7_no_schema_joins_no_schema2(self):`
`2648`	`2657`	`)`
`2649`	`2658`	`)`
`2650`	`2659`	`self.assertEqual(doc, {"no_schema": "no_schema", "matched": [{"no_schema2": "no_schema2"}]})`
	`2660`	`+ encrypted_client.close()`
`2651`	`2661`
`2652`	`2662`	`@client_context.require_version_min(8, 1, -1)`
`2653`	`2663`	`def test_8_csfle_joins_qe(self):`
`@@ -2674,6 +2684,7 @@ def test_8_csfle_joins_qe(self):`
`2674`	`2684`	`)`
`2675`	`2685`	`)`
`2676`	`2686`	`self.assertTrue("not supported" in str(exc))`
	`2687`	`+ encrypted_client.close()`
`2677`	`2688`
`2678`	`2689`	`@client_context.require_version_max(8, 1, -1)`
`2679`	`2690`	`def test_9_error(self):`
`@@ -2703,6 +2714,7 @@ def test_9_error(self):`
`2703`	`2714`	`)`
`2704`	`2715`	`)`
`2705`	`2716`	`self.assertTrue("Upgrade" in str(exc))`
	`2717`	`+ encrypted_client.close()`
`2706`	`2718`
`2707`	`2719`
`2708`	`2720`	`# https://github.com/mongodb/specifications/blob/072601/source/client-side-encryption/tests/README.md#rewrap`