From d728cc58918f163378852cc8dfda301ae3ee207f Mon Sep 17 00:00:00 2001 From: Yann poupon Date: Fri, 6 Sep 2024 11:32:58 +0200 Subject: [PATCH 1/3] fix: change connector auto open default value to False --- pyproject.toml | 2 +- src/pykiso/connector.py | 2 +- src/pykiso/logging_initializer.py | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7849c52c..76f73c71 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pykiso" -version = "0.29.1" +version = "0.29.2" description = "Embedded integration testing framework." authors = ["Sebastian Fischer "] license = "Eclipse Public License - v 2.0" diff --git a/src/pykiso/connector.py b/src/pykiso/connector.py index 1cf85c05..184abb02 100644 --- a/src/pykiso/connector.py +++ b/src/pykiso/connector.py @@ -74,7 +74,7 @@ def close(self): class CChannel(Connector): """Abstract class for coordination channel.""" - def __init__(self, processing=False, auto_open: bool = True, **kwargs: dict) -> None: + def __init__(self, processing=False, auto_open: bool = False, **kwargs: dict) -> None: """Constructor. :param processing: deprecated, will not be taken into account. diff --git a/src/pykiso/logging_initializer.py b/src/pykiso/logging_initializer.py index 2f36cea4..352057a1 100644 --- a/src/pykiso/logging_initializer.py +++ b/src/pykiso/logging_initializer.py @@ -225,9 +225,11 @@ def initialize_loggers(loggers: Optional[List[str]]) -> None: # store previous loggers to keep active (union of previous and current loggers) active_loggers |= set(loggers) - + logging.warning("active loggers are : %s", active_loggers) # set the loggers that are not part of active_loggers to level WARNING loggers_to_deactivate = set(relevant_loggers) - set(active_loggers) + logging.warning("loggers to deactivate are : %s", loggers_to_deactivate) + for logger_name in loggers_to_deactivate: logging.getLogger(logger_name).setLevel(logging.WARNING) From b7f53e39f486cfb945c644dae1d71b2953d3db6b Mon Sep 17 00:00:00 2001 From: Yann poupon Date: Fri, 6 Sep 2024 11:34:24 +0200 Subject: [PATCH 2/3] fix: change connector auto open default value to False --- src/pykiso/logging_initializer.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/pykiso/logging_initializer.py b/src/pykiso/logging_initializer.py index 352057a1..2f36cea4 100644 --- a/src/pykiso/logging_initializer.py +++ b/src/pykiso/logging_initializer.py @@ -225,11 +225,9 @@ def initialize_loggers(loggers: Optional[List[str]]) -> None: # store previous loggers to keep active (union of previous and current loggers) active_loggers |= set(loggers) - logging.warning("active loggers are : %s", active_loggers) + # set the loggers that are not part of active_loggers to level WARNING loggers_to_deactivate = set(relevant_loggers) - set(active_loggers) - logging.warning("loggers to deactivate are : %s", loggers_to_deactivate) - for logger_name in loggers_to_deactivate: logging.getLogger(logger_name).setLevel(logging.WARNING) From d69ae38d97ec0449fe094315ab9b6cbe08a05f7e Mon Sep 17 00:00:00 2001 From: Yann poupon Date: Fri, 6 Sep 2024 11:47:56 +0200 Subject: [PATCH 3/3] chore: increase test coverage --- tests/conftest.py | 41 +++++++++++++---------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 111d82f4..b058544f 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -31,11 +31,10 @@ pytest_plugins = ["pytester"] + ## skip slow test by default def pytest_addoption(parser): - parser.addoption( - "--runslow", action="store_true", default=False, help="run slow tests" - ) + parser.addoption("--runslow", action="store_true", default=False, help="run slow tests") def pytest_configure(config): @@ -57,7 +56,9 @@ class TestConnector: def __init__(self, *args, **kwargs): self.args = args self.kwargs = kwargs - self.auto_open = False + self.auto_open = True + def open(self): + pass class TestAux: def __init__(self, com = None, *args, **kwargs): @@ -203,9 +204,7 @@ def create_communication_pipeline(self, max_com): self.auxiliaries[-1].create_instance() def prepare_default_test_cases(self, param): - @define_test_parameters( - suite_id=param[0], case_id=param[1], aux_list=param[2] - ) + @define_test_parameters(suite_id=param[0], case_id=param[1], aux_list=param[2]) class MyTestCase(test_case.BasicTest): def test_run(self) -> None: pass @@ -213,29 +212,19 @@ def test_run(self) -> None: self.suite.addTest(MyTestCase(methodName="test_run")) def prepare_remote_test_cases(self, param): - @define_test_parameters( - suite_id=param[0], case_id=param[1], aux_list=param[2] - ) + @define_test_parameters(suite_id=param[0], case_id=param[1], aux_list=param[2]) class MyTestCase(test_case.RemoteTest): pass self.suite.addTest(MyTestCase("test_run")) - def prepare_default_test_suites( - self, modules_to_add_dir, test_filter_pattern, test_suite_id - ): + def prepare_default_test_suites(self, modules_to_add_dir, test_filter_pattern, test_suite_id): class MyTestSuite(test_suite.BasicTestSuite): - def __init__( - self, modules_to_add_dir, test_filter_pattern, test_suite_id - ): - super(MyTestSuite, self).__init__( - modules_to_add_dir, test_filter_pattern, test_suite_id - ) + def __init__(self, modules_to_add_dir, test_filter_pattern, test_suite_id): + super(MyTestSuite, self).__init__(modules_to_add_dir, test_filter_pattern, test_suite_id) # Start integration test - self.custom_test_suite = MyTestSuite( - modules_to_add_dir, test_filter_pattern, test_suite_id - ) + self.custom_test_suite = MyTestSuite(modules_to_add_dir, test_filter_pattern, test_suite_id) def stop(self): for aux in self.auxiliaries: @@ -406,9 +395,7 @@ def cases_response(): def runs_response(): response = requests.Response() response.status_code = 200 - response._content = json.dumps( - {"offset": 0, "runs": [{"id": 1, "name": "..."}, {"id": 2, "name": "..."}]} - ) + response._content = json.dumps({"offset": 0, "runs": [{"id": 1, "name": "..."}, {"id": 2, "name": "..."}]}) return response @@ -446,9 +433,7 @@ def add_result_response(): def add_run_response(): response = requests.Response() response.status_code = 200 - response._content = json.dumps( - {"id": 1, "config": "Firefox, Ubuntu 12", "milestone_id": 1, "failed_count": 10} - ) + response._content = json.dumps({"id": 1, "config": "Firefox, Ubuntu 12", "milestone_id": 1, "failed_count": 10}) return response