From 19f03bc4e69a4b4aa84702d136bca9907c04ce4b Mon Sep 17 00:00:00 2001 From: Oleksandr Shchirskyi Date: Thu, 19 Aug 2021 16:05:42 +0200 Subject: [PATCH 1/3] Add CAS log dump to extra logs Commit 51a8fca8872808c0809ef715c9b6a8d19b9310f3 in test-framework adds possibility to specify extra logs to dump. Move CAS log to this extra logs, as it's project specific logs not related to generic test framework Signed-off-by: Oleksandr Shchirskyi --- test/functional/tests/conftest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/functional/tests/conftest.py b/test/functional/tests/conftest.py index fd930b8..fb19f6e 100644 --- a/test/functional/tests/conftest.py +++ b/test/functional/tests/conftest.py @@ -33,6 +33,7 @@ class Opencas(metaclass=Singleton): self.repo_dir = repo_dir self.working_dir = working_dir self.already_updated = False + self.logs_to_dump = {"cas": "/var/log/opencas.log"} def pytest_runtest_setup(item): From daae3f743970b7a1c3ea65d06b429ec5dd855e18 Mon Sep 17 00:00:00 2001 From: Oleksandr Shchirskyi Date: Fri, 20 Aug 2021 18:40:23 +0200 Subject: [PATCH 2/3] Move extra logs definition to dut_config Signed-off-by: Oleksandr Shchirskyi --- test/functional/tests/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/tests/conftest.py b/test/functional/tests/conftest.py index fb19f6e..044c3e6 100644 --- a/test/functional/tests/conftest.py +++ b/test/functional/tests/conftest.py @@ -33,7 +33,6 @@ class Opencas(metaclass=Singleton): self.repo_dir = repo_dir self.working_dir = working_dir self.already_updated = False - self.logs_to_dump = {"cas": "/var/log/opencas.log"} def pytest_runtest_setup(item): @@ -54,6 +53,7 @@ def pytest_runtest_setup(item): dut_config['plugins_dir'] = os.path.join(os.path.dirname(__file__), "../lib") dut_config['opt_plugins'] = {"test_wrapper": {}, "serial_log": {}, "power_control": {}} + dut_config['extra_logs'] = {"cas": "/var/log/opencas.log"} try: TestRun.prepare(item, dut_config) From 8a3da66736bb4d05df365f72f91eb010c41a9c79 Mon Sep 17 00:00:00 2001 From: Oleksandr Shchirskyi Date: Thu, 26 Aug 2021 10:03:09 +0200 Subject: [PATCH 3/3] Change test-framework version Signed-off-by: Oleksandr Shchirskyi --- test/functional/test-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/test-framework b/test/functional/test-framework index 6f9e024..e475f45 160000 --- a/test/functional/test-framework +++ b/test/functional/test-framework @@ -1 +1 @@ -Subproject commit 6f9e0248aa46ecbb51227d5618bcb48fa536fbd9 +Subproject commit e475f4518508927ec415ad57d899efdf7c585117