fix: factor out mongodb close logic

ampel/core/AmpelDB.py

@@ -145,6 +145,15 @@ def __init__(self, **kwargs) -> None:
 		):
 			raise UnknownDatabase(f"Database(s) with prefix {self.prefix} do not exist")
 
+	def close(self) -> None:
+		for mc in self.mongo_clients.values():
+			mc.close()
+		self.mongo_collections.clear()
+		self.mongo_clients.clear()
+		# deleting the attribute resets cached_property
+		for attr in ("col_trace_ids", "col_conf_ids", "trace_ids", "conf_ids"):
+			with suppress(AttributeError):
+				delattr(self, attr)
 
 	@cached_property
 	def col_trace_ids(self) -> Collection:
@@ -466,14 +475,7 @@ def drop_all_databases(self) -> None:
 		for db in self.databases:
 			pym_db = self._get_pymongo_db(db.name, role=db.role.w)
 			pym_db.client.drop_database(pym_db.name)
-		self.mongo_collections.clear()
-		for mc in self.mongo_clients.values():
-			mc.close()
-		self.mongo_clients.clear()
-		# deleting the attribute resets cached_property
-		for attr in ("col_trace_ids", "col_conf_ids", "trace_ids", "conf_ids"):
-			with suppress(AttributeError):
-				delattr(self, attr)
+		self.close()
 
 
 	def add_trace_id(self, trace_id: int, arg: dict[str, Any]) -> None:

ampel/test/conftest.py

@@ -63,7 +63,8 @@ def mongod(pytestconfig):
             "NetworkSettings"
         ]["Ports"]["27017/tcp"][0]["HostPort"]
         # wait for startup
-        list(pymongo.MongoClient(port=int(port)).list_databases())
+        with pymongo.MongoClient(port=int(port)) as client:
+            list(client.list_databases())
         yield f"mongodb://localhost:{port}"
     finally:
         ...
@@ -100,11 +101,13 @@ def mock_context(_patch_mongo, testing_config: PosixPath):
 
 @pytest.fixture
 def integration_context(mongod, testing_config: PosixPath):
-    return DevAmpelContext.load(
+    ctx = DevAmpelContext.load(
         config=str(testing_config),
         purge_db=True,
         custom_conf={"resource.mongo": mongod},
     )
+    yield ctx
+    ctx.db.close()
 
 
 # metafixture as suggested in https://github.com/pytest-dev/pytest/issues/349#issuecomment-189370273