From c8db2057dc043b3e32bd976da431a1ae5c2fa356 Mon Sep 17 00:00:00 2001 From: Tobias Persson Date: Fri, 22 Nov 2024 08:40:07 +0100 Subject: [PATCH] Fix the tests and some pylint fixes --- projects/etos_suite_runner/pyproject.toml | 4 ++-- projects/etos_suite_runner/src/etos_suite_runner/esr.py | 2 +- .../src/etos_suite_runner/lib/esr_parameters.py | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/projects/etos_suite_runner/pyproject.toml b/projects/etos_suite_runner/pyproject.toml index de4d64a..d5edcf4 100644 --- a/projects/etos_suite_runner/pyproject.toml +++ b/projects/etos_suite_runner/pyproject.toml @@ -18,8 +18,8 @@ requires-python = ">=3.9" dependencies = [ "packageurl-python~=0.11", "cryptography>=42.0.4,<43.0.0", - "etos_lib==4.4.1", - "etos_environment_provider==5.2.0", + "etos_lib==4.4.2", + "etos_environment_provider==5.2.1", "opentelemetry-api~=1.21", "opentelemetry-exporter-otlp~=1.21", "opentelemetry-sdk~=1.21", diff --git a/projects/etos_suite_runner/src/etos_suite_runner/esr.py b/projects/etos_suite_runner/src/etos_suite_runner/esr.py index 052ee16..51a9c20 100644 --- a/projects/etos_suite_runner/src/etos_suite_runner/esr.py +++ b/projects/etos_suite_runner/src/etos_suite_runner/esr.py @@ -143,7 +143,7 @@ def __request_environment(self, ids: list[str]) -> None: result = provider.run() except Exception as exc: self.params.set_status("FAILURE", "Failed to run environment provider") - self.logger.error( + self.logger.exception( "Environment provider has failed in creating an environment for test.", extra={"user_log": True}, ) diff --git a/projects/etos_suite_runner/src/etos_suite_runner/lib/esr_parameters.py b/projects/etos_suite_runner/src/etos_suite_runner/lib/esr_parameters.py index 8e33575..77b4c0a 100644 --- a/projects/etos_suite_runner/src/etos_suite_runner/lib/esr_parameters.py +++ b/projects/etos_suite_runner/src/etos_suite_runner/lib/esr_parameters.py @@ -60,7 +60,10 @@ def get_status(self) -> dict: return self.environment_status.copy() def _get_id( - self, config_key: str, environment_variable: str, eiffel_event: Union[None, list[dict], dict] + self, + config_key: str, + environment_variable: str, + eiffel_event: Union[None, list[dict], dict], ) -> str: """Get ID will return an ID either from an environment variable or an eiffel event.""" if self.etos.config.get(config_key) is None: @@ -103,7 +106,7 @@ def environment_requests(self) -> list: return response.items def main_suite_ids(self) -> list[str]: - """Expected main test suite IDs to set on the TestSuiteStarted events. + """Test suite IDs to set on the main TestSuiteStarted events. These IDs are also passed to the environment provider either generated or taken from the Environment requests to the environment provider, and are