rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up temporary data dir in LabThingsTestEnv after test

Browse source
This commit is contained in:
Julian Stirling 2026-05-14 11:24:05 +01:00
parent 9d68718570
commit 7d84390404
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tests/shared_utils/lt_test_utils.py
View file

@ -42,24 +42,28 @@ class LabThingsTestEnv:
as a context manager: as a context manager:
:param things: The thing configuration dictionary used to initialise the server. :param things: The thing configuration dictionary used to initialise the server.
:param settings_folder: The settings folder to use. :param settings_folder: The settings folder to use. If None a tempdir is created
for this.
:param application_config: The application configuration dictionary. If None is
supplied then "data_folder" is set to a temporary directory.
""" """
self._server: Optional[lt.ThingServer] self._server: Optional[lt.ThingServer]
self._test_client: Optional[TestClient] self._test_client: Optional[TestClient]
self._things_config = things self._things_config = things
self._settings_folder = settings_folder self._settings_folder = settings_folder
# Labthings requires an application config for the data_folder self._application_config = application_config
if application_config: self._settings_tmp_dir: Optional[tempfile.TemporaryDirectory] = None
self._application_config = application_config self._data_tmp_dir: Optional[tempfile.TemporaryDirectory] = None
else:
self._application_config = {"data_folder": tempfile.TemporaryDirectory()}
self._tmp_dir_obj: Optional[tempfile.TemporaryDirectory] = None
def __enter__(self) -> Self: def __enter__(self) -> Self:
"""Create server and run it in the TestClient.""" """Create server and run it in the TestClient."""
# Any OFMThings require an application config for the data_folder
if self._application_config is None:
self._data_tmp_dir = tempfile.TemporaryDirectory()
self._application_config = {"data_folder": self._data_tmp_dir}
if self._settings_folder is None: if self._settings_folder is None:
self._tmp_dir_obj = tempfile.TemporaryDirectory() self._settings_tmp_dir = tempfile.TemporaryDirectory()
self._settings_folder = self._tmp_dir_obj.name self._settings_folder = self._settings_tmp_dir.name
self._server = lt.ThingServer( self._server = lt.ThingServer(
things=self._things_config, things=self._things_config,
settings_folder=self._settings_folder, settings_folder=self._settings_folder,
@ -77,8 +81,10 @@ class LabThingsTestEnv:
) -> None: ) -> None:
"""Close the TestClient and cleanup.""" """Close the TestClient and cleanup."""
self._test_client.__exit__(exc_type, exc_value, traceback) self._test_client.__exit__(exc_type, exc_value, traceback)
if self._tmp_dir_obj is not None: if self._settings_tmp_dir is not None:
self._tmp_dir_obj.cleanup() self._settings_tmp_dir.cleanup()
if self._data_tmp_dir is not None:
self._data_tmp_dir.cleanup()
@property @property
def server(self) -> lt.ThingServer: def server(self) -> lt.ThingServer: