mutate client context to reset it

Author: sleepyStick

test/__init__.py

@@ -127,6 +127,9 @@ def __init__(self):
             server_api = ServerApi(MONGODB_API_VERSION)
             self.default_client_options["server_api"] = server_api
 
+    def reset(self):
+        self.__init__()
+
     @property
     def client_options(self):
         """Return the MongoClient options for creating a duplicate client."""
@@ -859,13 +862,12 @@ def max_message_size_bytes(self):
 client_context = ClientContext()
 
 
-def recreate_client_context():
+def reset_client_context():
     if _IS_SYNC:
         # sync tests don't need to recreate a client context
         return
-    global client_context
     teardown()
-    client_context = ClientContext()
+    client_context.reset()
     setup()
 
 

test/asynchronous/__init__.py

@@ -127,6 +127,9 @@ def __init__(self):
             server_api = ServerApi(MONGODB_API_VERSION)
             self.default_client_options["server_api"] = server_api
 
+    def reset(self):
+        self.__init__()
+
     @property
     def client_options(self):
         """Return the MongoClient options for creating a duplicate client."""
@@ -861,13 +864,12 @@ async def max_message_size_bytes(self):
 async_client_context = AsyncClientContext()
 
 
-async def recreate_client_context():
+async def reset_client_context():
     if _IS_SYNC:
         # sync tests don't need to recreate a client context
         return
-    global async_client_context
     await async_teardown()
-    async_client_context = AsyncClientContext()
+    async_client_context.reset()
     await async_setup()
 
 

test/asynchronous/test_connections_survive_primary_stepdown_spec.py

@@ -22,7 +22,7 @@
 from test.asynchronous import (
     AsyncIntegrationTest,
     async_client_context,
-    recreate_client_context,
+    reset_client_context,
     unittest,
 )
 from test.asynchronous.helpers import async_repl_set_step_down
@@ -65,7 +65,7 @@ async def _setup_class(cls):
     @classmethod
     async def _tearDown_class(cls):
         await cls.client.close()
-        await recreate_client_context()
+        await reset_client_context()
 
     async def asyncSetUp(self):
         # Note that all ops use same write-concern as self.db (majority).

test/test_connections_survive_primary_stepdown_spec.py

@@ -22,7 +22,7 @@
 from test import (
     IntegrationTest,
     client_context,
-    recreate_client_context,
+    reset_client_context,
     unittest,
 )
 from test.helpers import repl_set_step_down
@@ -65,7 +65,7 @@ def _setup_class(cls):
     @classmethod
     def _tearDown_class(cls):
         cls.client.close()
-        recreate_client_context()
+        reset_client_context()
 
     def setUp(self):
         # Note that all ops use same write-concern as self.db (majority).

test/test_monitor.py

@@ -29,7 +29,7 @@
     wait_until,
 )
 
-from pymongo.synchronous.periodic_executor import _EXECUTORS
+from pymongo.periodic_executor import _EXECUTORS
 
 
 def unregistered(ref):