diff --git a/CHANGELOG.md b/CHANGELOG.md index 87259fd3..e1011f7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.12.2b1] ### Added +- Coverage to the test suite. This includes adding tests for: + - `merlin/common/` + - `merlin/config/` + - `merlin/examples/` + - `celeryadapter.py` +- Context managers for the `conftest.py` file to ensure safe spin up and shutdown of fixtures + - `RedisServerManager`: context to help with starting/stopping a redis server for tests + - `CeleryWorkersManager`: context to help with starting/stopping workers for tests +- Ability to copy and print the `Config` object from `merlin/config/__init__.py` - Conflict handler option to the `dict_deep_merge` function in `utils.py` - Ability to add module-specific pytest fixtures - Added fixtures specifically for testing status functionality @@ -139,7 +148,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The `merlin monitor` command will now keep an allocation up if the queues are empty and workers are still processing tasks - Add the restart keyword to the specification docs - Cyclical imports and config imports that could easily cause ci issues - ## [1.11.1] ### Fixed - Typo in `batch.py` that caused lsf launches to fail (`ALL_SGPUS` changed to `ALL_GPUS`) diff --git a/tests/conftest.py b/tests/conftest.py index fb06586b..aa0b92c6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -55,6 +55,8 @@ ####################################### # Loading in Module Specific Fixtures # ####################################### + + pytest_plugins = [ fixture_file.replace("/", ".").replace(".py", "") for fixture_file in glob("tests/fixtures/[!__]*.py", recursive=True) ] diff --git a/tests/fixtures/status.py b/tests/fixtures/status.py index 145e81f5..7e581bb8 100644 --- a/tests/fixtures/status.py +++ b/tests/fixtures/status.py @@ -32,7 +32,7 @@ def status_testing_dir(temp_output_dir: str) -> str: @pytest.fixture(scope="class") -def status_empty_file(status_testing_dir: str) -> str: # pylint: disable=W0621 +def status_empty_file(status_testing_dir: str) -> str: """ A pytest fixture to create an empty status file.