Set terminal-no-fork as default (#594)

* Tests with default terminal-no-fork

* style

* dev

* dev

* Defualt terminal

* dev

* Warning for old terminnal

* Version

* Cosmetic changes flake8

* redefinition

* log debug

* dev

* style

* tuple for Python3.8

* dev

* fix test helpers

* f

* f

* style

* style

Author: marcin-usielski

moler/asyncio_runner.py

@@ -801,7 +801,7 @@ def cleanup_remaining_tasks(loop, logger):
     # https://stackoverflow.com/questions/30765606/whats-the-correct-way-to-clean-up-after-an-interrupted-event-loop
     # https://medium.com/python-pandemonium/asyncio-coroutine-patterns-beyond-await-a6121486656f
     # Handle shutdown gracefully by waiting for all tasks to be cancelled
-    all_tasks = [task for task in asyncio.Task.all_tasks(loop=loop)]
+
     not_done_tasks = [task for task in asyncio.Task.all_tasks(loop=loop) if not task.done()]
     if not_done_tasks:
         logger.info("cancelling all remaining tasks")

moler/cmd/unix/ctrl_c.py

@@ -4,12 +4,11 @@
 """
 
 __author__ = 'Marcin Usielski'
-__copyright__ = 'Copyright (C) 2019-2025, Nokia'
+__copyright__ = 'Copyright (C) 2019-2026, Nokia'
 __email__ = 'marcin.usielski@nokia.com'
 
 import re
 from moler.cmd.commandchangingprompt import CommandChangingPrompt
-from moler.cmd.commandtextualgeneric import CommandTextualGeneric
 
 
 class CtrlC(CommandChangingPrompt):

moler/cmd/unix/ip_maddr.py

@@ -4,7 +4,7 @@
 """
 
 __author__ = 'Marcin Usielski'
-__copyright__ = 'Copyright (C) 2025, Nokia'
+__copyright__ = 'Copyright (C) 2025-2026, Nokia'
 __email__ = 'marcin.usielski@nokia.com'
 
 import re
@@ -33,7 +33,7 @@ def build_command_string(self) -> str:
         Build command string from parameters passed to object.
         :return: String representation of command to send over connection to device.
         """
-        cmd = f"ip maddr"
+        cmd = "ip maddr"
         if self.options:
             cmd = f"{cmd} {self.options}"
             self.ret_required = True if self.options == 'show' else False

moler/cmd/unix/telnet.py

@@ -4,10 +4,9 @@
 """
 
 __author__ = 'Marcin Usielski'
-__copyright__ = 'Copyright (C) 2018-2024, Nokia'
+__copyright__ = 'Copyright (C) 2018-2026, Nokia'
 __email__ = 'marcin.usielski@nokia.com'
 
-import re
 
 from moler.cmd.unix.generictelnetssh import GenericTelnetSsh
 from moler.exceptions import ParsingDone

moler/config/__init__.py

@@ -3,7 +3,7 @@
 Moler related configuration
 """
 __author__ = "Grzegorz Latuszek, Marcin Usielski, Michal Ernst, Tomasz Krol"
-__copyright__ = "Copyright (C) 2018-2022, Nokia"
+__copyright__ = "Copyright (C) 2018-2026, Nokia"
 __email__ = "grzegorz.latuszek@nokia.com, marcin.usielski@nokia.com, michal.ernst@nokia.com, tomasz.krol@nokia.com"
 import os
 from contextlib import contextmanager
@@ -267,22 +267,7 @@ def load_logger_from_config(config):
     log_cfg.configure_moler_main_logger()
 
 
-def _config_rotating(config):
-    if "KIND" in config["LOGGER"]:
-        print(
-            "Warning! Please update LOGGER to new style. 'KIND' should now exist in LOG_ROTATION section."
-        )  # Logger is not available here.
-        log_cfg.set_kind(config["LOGGER"]["KIND"])
-    if "INTERVAL" in config["LOGGER"]:
-        print(
-            "Warning! Please update LOGGER to new style. 'INTERVAL' should now exist in LOG_ROTATION section."
-        )  # Logger is not available here.
-        log_cfg.set_interval(config["LOGGER"]["INTERVAL"])
-    if "BACKUP_COUNT" in config["LOGGER"]:
-        print(
-            "Warning! Please update LOGGER to new style. 'BACKUP_COUNT' should now exist in LOG_ROTATION section."
-        )  # Logger is not available here.
-        log_cfg.set_backup_count(config["LOGGER"]["BACKUP_COUNT"])
+def _update_config_log_rotation(config: dict) -> None:
     if "LOG_ROTATION" in config["LOGGER"]:
         log_rotation = config["LOGGER"]["LOG_ROTATION"]
         if "KIND" in log_rotation:
@@ -300,6 +285,25 @@ def _config_rotating(config):
             log_cfg.set_compressed_file_extension(
                 log_rotation["COMPRESSED_FILE_EXTENSION"]
             )
+
+
+def _config_rotating(config):
+    if "KIND" in config["LOGGER"]:
+        print(
+            "Warning! Please update LOGGER to new style. 'KIND' should now exist in LOG_ROTATION section."
+        )  # Logger is not available here.
+        log_cfg.set_kind(config["LOGGER"]["KIND"])
+    if "INTERVAL" in config["LOGGER"]:
+        print(
+            "Warning! Please update LOGGER to new style. 'INTERVAL' should now exist in LOG_ROTATION section."
+        )  # Logger is not available here.
+        log_cfg.set_interval(config["LOGGER"]["INTERVAL"])
+    if "BACKUP_COUNT" in config["LOGGER"]:
+        print(
+            "Warning! Please update LOGGER to new style. 'BACKUP_COUNT' should now exist in LOG_ROTATION section."
+        )  # Logger is not available here.
+        log_cfg.set_backup_count(config["LOGGER"]["BACKUP_COUNT"])
+    _update_config_log_rotation(config)
     if "CONSOLE_LOGS" in config["LOGGER"]:
         for logger_name in config["LOGGER"]["CONSOLE_LOGS"]:
             log_cfg.add_console_log(logger_name)

moler/config/connections.py

@@ -229,20 +229,35 @@ def terminal_nofork_thd_conn_st(name=None):
         return io_conn
 
     # TODO: unify passing logger to io_conn (logger/logger_name)
-    connection_factory.register_construction(io_type="terminal",
+    connection_factory.register_construction(io_type="terminal_fork",
                                              variant="threaded",
                                              constructor=terminal_thd_conn_mt)
 
     # TODO: unify passing logger to io_conn (logger/logger_name)
-    connection_factory.register_construction(io_type="terminal",
+    connection_factory.register_construction(io_type="terminal_fork",
                                              variant="multi-threaded",
                                              constructor=terminal_thd_conn_mt)
 
     # TODO: unify passing logger to io_conn (logger/logger_name)
-    connection_factory.register_construction(io_type="terminal",
+    connection_factory.register_construction(io_type="terminal_fork",
                                              variant="single-threaded",
                                              constructor=terminal_thd_conn_st)
 
+    # TODO: unify passing logger to io_conn (logger/logger_name)
+    connection_factory.register_construction(io_type="terminal",
+                                             variant="threaded",
+                                             constructor=terminal_nofork_thd_conn_mt)
+
+    # TODO: unify passing logger to io_conn (logger/logger_name)
+    connection_factory.register_construction(io_type="terminal",
+                                             variant="multi-threaded",
+                                             constructor=terminal_nofork_thd_conn_mt)
+
+    # TODO: unify passing logger to io_conn (logger/logger_name)
+    connection_factory.register_construction(io_type="terminal",
+                                             variant="single-threaded",
+                                             constructor=terminal_nofork_thd_conn_st)
+
     # TODO: unify passing logger to io_conn (logger/logger_name)
     connection_factory.register_construction(io_type="terminal_no_fork",
                                              variant="threaded",

moler/device/__init__.py

@@ -9,5 +9,8 @@
 __copyright__ = 'Copyright (C) 2018, Nokia'
 __email__ = 'grzegorz.latuszek@nokia.com'
 
+
 from moler.device.textualdevice import TextualDevice
 from moler.device.device import DeviceFactory
+
+__all__ = ['TextualDevice', 'DeviceFactory']

moler/device/proxy_pc.py

@@ -6,7 +6,7 @@
 """
 
 __author__ = 'Marcin Usielski'
-__copyright__ = 'Copyright (C) 2024-2025, Nokia'
+__copyright__ = 'Copyright (C) 2024-2026, Nokia'
 __email__ = 'marcin.usielski@nokia.com'
 import six
 import abc
@@ -70,19 +70,6 @@ def _prepare_sm_data(self, sm_params):
         self._prepare_newline_chars()
         self._send_transitions_to_sm(self._stored_transitions)
 
-    def _prepare_transitions(self):
-        """
-        Prepare transitions to change states.
-        :return: None
-        """
-
-        stored_is_proxy_pc = self._use_proxy_pc
-        self._use_proxy_pc = True
-        super(ProxyPc, self)._prepare_transitions()
-        self._use_proxy_pc = stored_is_proxy_pc
-        transitions = self._prepare_transitions_with_proxy_pc()
-        self._add_transitions(transitions=transitions)
-
     def _prepare_dicts_for_sm(self, sm_params):
         """
         Prepare transitions to change states.

moler/device/textualdevice.py

@@ -1158,7 +1158,7 @@ def _stop_prompts_observers(self):
                         break
                     time.sleep(self._tick_to_check_runner)
                 event.remove_event_occurred_callback()
-        except Exception as e:
+        except Exception:
             pass
 
     def build_trigger_to_state(self, state):

moler/event_awaiter.py

@@ -126,16 +126,30 @@ def start_command_after_event(cls, cmds: Sequence, events: Sequence, event_timeo
             except IndexError:
                 cmd.start()
             else:
-                events_after_command = event
-                if event is None:
-                    events_after_command = ()
-                elif isinstance(event, ConnectionObserver):
-                    events_after_command = (event,)
-                for event in events_after_command:
-                    event.start()
-                for cmd_item in cmds_items:
-                    cmd_item.start()
-                for event in events_after_command:
-                    event.await_done(timeout=event_timeout)
-                if sleep_after_event > 0.:
-                    MolerTest.sleep(sleep_after_event)
+                cls._execute_after(
+                    event=event,
+                    cmds_items=cmds_items,
+                    event_timeout=event_timeout,
+                    sleep_after_event=sleep_after_event
+                )
+
+    @classmethod
+    def _execute_after(cls, event, cmds_items, event_timeout, sleep_after_event) -> None:
+        """
+        Execute the given command after the given event is done.
+
+        :return: None
+        """
+        events_after_command = event
+        if event is None:
+            events_after_command = ()
+        elif isinstance(event, ConnectionObserver):
+            events_after_command = (event,)
+        for event in events_after_command:
+            event.start()
+        for cmd_item in cmds_items:
+            cmd_item.start()
+        for event in events_after_command:
+            event.await_done(timeout=event_timeout)
+        if sleep_after_event > 0.:
+            MolerTest.sleep(sleep_after_event)