Skip to content

Commit

Permalink
dev v5
Browse files Browse the repository at this point in the history
  • Loading branch information
marcin-usielski committed Nov 15, 2024
1 parent 121906a commit 00460f8
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
4 changes: 2 additions & 2 deletions moler/config/loggers.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
%% %%% %%% %% %%% %% %%% %%%%%%%%% %%% %%%%%%%
%% %%%%% %% %%% %% %%% %%% %%% %%%
%% %%% %% %%%%%%%%%%% %%%%%%%%% %%%%%%%%%% %%% %%%
Prompt detecting v4.
Prompt detecting v5.
"""


Expand Down Expand Up @@ -590,7 +590,7 @@ def configure_moler_main_logger():
logger.info(moler_logo)
msg = f"Using specific packages version:\nPython: {platform.python_version()}\nmoler: {_get_moler_version()}"
logger.info(msg)
msg_sys = f"OS: '{os.name}' sys: '{sys.platform}' system: '{platform.system()}' release: '{platform.release()}' version: '{platform.version()}'"
msg_sys = f"OS: '{os.name}' sys: '{sys.platform}' system: '{platform.system()}' release: '{platform.release()}' version: '{platform.version()}', cpu: '{platform.processor()}', architecture '{platform.architecture()}'"
logger.info(msg_sys)
configure_moler_threads_logger()
logger.info(f"More logs in: {_logging_path}")
Expand Down
17 changes: 13 additions & 4 deletions moler/device/proxy_pc2.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ def _detect_after_open_prompt(self, set_callback):
detector.add_event_occurred_callback(callback=set_callback,
callback_params={"event": detector})
detector.start(timeout=self._prompt_detector_timeout)
self.logger.info("Prompt detector started")
self.io_connection.moler_connection.sendline("")
self.io_connection.moler_connection.sendline(self._detecting_prompt_cmd)
self.io_connection.moler_connection.sendline("")
Expand Down Expand Up @@ -483,14 +484,22 @@ def get_cmd(self, cmd_name, cmd_params=None, check_state=True, for_state=None):
for_state=for_state)

def _detect_prompt_get_cmd(self):
self.logger.info("get_cmd was called but prompt has not been detected yet.")
if self._after_open_prompt_detector is None or not self._after_open_prompt_detector.running():
self.logger.info("get_cmd was called v5 but prompt has not been detected yet.")
if self._after_open_prompt_detector is None or self._after_open_prompt_detector.running() is not True:
self.logger.info("_detect_prompt_get_cmd after_open_prompt_detector is not running! Let's run it.")
self._detect_after_open_prompt(self._set_after_open_prompt)
self._after_open_prompt_detector.await_done(timeout=self._prompt_detector_timeout)
try:
self._after_open_prompt_detector.await_done(timeout=self._prompt_detector_timeout)
except MolerException:
self.logger.info(f"Timeout for prompt detector {self._after_open_prompt_detector}.")

self._after_open_prompt_detector.cancel()
self._after_open_prompt_detector = None
self.logger.info("SET self._after_open_prompt_detector = None")
if not self._prompt_detected:
raise MolerException(f"Device {self.public_name} cannot detect prompt!")
msg = f"Device {self.public_name} cannot detect prompt!"
self.logger.info(msg)
raise MolerException(msg)
self.io_connection.moler_connection.sendline("")
self.logger.info(f"Sleep after prompt detection for {self._prompt_detector_timeout} seconds.")
time.sleep(self._prompt_detector_timeout)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name='moler',
version='3.12.154',
version='3.12.155',
description='Moler is a library for working with terminals, mainly for automated tests', # Required
long_description=long_description,
long_description_content_type='text/markdown',
Expand Down

0 comments on commit 00460f8

Please sign in to comment.