From 450db2fb7477592e278b2832602fb0ea3d14a7fe Mon Sep 17 00:00:00 2001 From: flo117 <67757587+flo117@users.noreply.github.com> Date: Mon, 19 Jun 2023 16:09:43 +0200 Subject: [PATCH] feat: added shutdown method to CCHannel [ready for review] (#310) * feat: added shutdown method to CChannel interface Co-authored-by: Sebastian Clerson <58192998+sebclrsn@users.noreply.github.com> --------- Co-authored-by: Sebastian Clerson <58192998+sebclrsn@users.noreply.github.com> --- src/pykiso/connector.py | 4 ++++ src/pykiso/lib/connectors/cc_pcan_can.py | 2 +- src/pykiso/test_setup/dynamic_loader.py | 6 +++--- tests/conftest.py | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/pykiso/connector.py b/src/pykiso/connector.py index 028ac6e8..985400cb 100644 --- a/src/pykiso/connector.py +++ b/src/pykiso/connector.py @@ -100,6 +100,10 @@ def close(self) -> None: with self._lock: self._cc_close() + def shutdown(self) -> None: + """Unitialize channel. Will be called at the end of the test session.""" + pass + def cc_send(self, msg: MsgType, *args, **kwargs) -> None: """Send a thread-safe message on the channel and wait for an acknowledgement. diff --git a/src/pykiso/lib/connectors/cc_pcan_can.py b/src/pykiso/lib/connectors/cc_pcan_can.py index 6cbc7909..f7fba9e5 100644 --- a/src/pykiso/lib/connectors/cc_pcan_can.py +++ b/src/pykiso/lib/connectors/cc_pcan_can.py @@ -503,7 +503,7 @@ def _convert_peak_format_to_start_time(start_time: float) -> float: ms_in_a_day = 86400000 return (start_time % 1) * ms_in_a_day - def __del__(self) -> None: + def shutdown(self) -> None: """Destructor method.""" if self.logging_activated: self._merge_trc() diff --git a/src/pykiso/test_setup/dynamic_loader.py b/src/pykiso/test_setup/dynamic_loader.py index de3d3c3d..a73cd1ac 100644 --- a/src/pykiso/test_setup/dynamic_loader.py +++ b/src/pykiso/test_setup/dynamic_loader.py @@ -232,10 +232,10 @@ def get_instance(self, name: str) -> Union[AuxiliaryCommon, Connector]: return inst def delete_all_instances(self) -> None: - """Call custom del method if it exists""" + """Call shutdown method if it exists""" for instance in self.instances.values(): - if callable(getattr(instance, "__del__", None)): - instance.__del__() + if callable(getattr(instance, "shutdown", None)): + instance.shutdown() class AuxiliaryCache(ModuleCache): diff --git a/tests/conftest.py b/tests/conftest.py index 3fa61345..98609b5b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -245,7 +245,7 @@ def __init__(self, *args, **kwargs): super(TCChan, self).__init__(*args, **kwargs) self.remote_id = None - def __del__(self): + def shutdown(self): pass _cc_open = mocker.stub(name="_cc_open")