Dev fix- 4.0.1 (#564)

* fix

* f2

* Version 4.0.1

Author: marcin-usielski

CHANGELOG.md

@@ -1,3 +1,6 @@
+## moler 4.0.1
+ * UnixRemote - change the Exception when wrong configuration
+
 ## moler 4.0.0
  * Exchange state machines for devices (conditionally delete state PROXY_PC as default)
 

README.md

@@ -1,4 +1,4 @@
-[![image](https://img.shields.io/badge/pypi-v4.0.0-blue.svg)](https://pypi.org/project/moler/)
+[![image](https://img.shields.io/badge/pypi-v4.0.1-blue.svg)](https://pypi.org/project/moler/)
 [![image](https://img.shields.io/badge/python-3.7%20%7C%203.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12%20%7C%203.13-blue.svg)](https://pypi.org/project/moler/)
 [![Build Status](https://github.com/nokia/moler/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/nokia/moler/actions)
 [![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](./LICENSE)

moler/device/unixremote.py

@@ -10,8 +10,8 @@
 __email__ = "marcin.usielski@nokia.com"
 
 
-import logging
 from moler.device.proxy_pc import ProxyPc
+from moler.exceptions import DeviceFailure
 from moler.helpers import (
     call_base_class_method_with_same_name,
     mark_to_call_base_class_method_with_same_name,
@@ -61,10 +61,10 @@ class UnixRemote(ProxyPc):
                         UNIX_REMOTE:
                             execute_command: ssh # default value
                             command_params:
-                            expected_prompt: unix_remote_prompt
-                            host: host_ip
-                            login: login
-                            password: password
+                                expected_prompt: unix_remote_prompt
+                                host: host_ip
+                                login: login
+                                password: password
 
 
     """
@@ -116,21 +116,27 @@ def _overwrite_prompts(self):
         Overwrite prompts for some states to easily configure the SM.
         """
         super(UnixRemote, self)._overwrite_prompts()
-        if self._use_proxy_pc:
-            self._configurations[UnixRemote.connection_hops][UnixRemote.unix_remote][UnixRemote.proxy_pc][
-                "command_params"]["expected_prompt"] = \
-                self._configurations[UnixRemote.connection_hops][UnixRemote.unix_local][UnixRemote.proxy_pc][
-                    "command_params"]["expected_prompt"]
+        try:
+            if self._use_proxy_pc:
+                self._configurations[UnixRemote.connection_hops][UnixRemote.unix_remote][UnixRemote.proxy_pc][
+                    "command_params"]["expected_prompt"] = \
+                    self._configurations[UnixRemote.connection_hops][UnixRemote.unix_local][UnixRemote.proxy_pc][
+                        "command_params"]["expected_prompt"]
 
-            self._configurations[UnixRemote.connection_hops][UnixRemote.unix_remote_root][UnixRemote.unix_remote][
-                "command_params"]["expected_prompt"] = \
-                self._configurations[UnixRemote.connection_hops][UnixRemote.proxy_pc][UnixRemote.unix_remote][
-                    "command_params"]["expected_prompt"]
-        else:
-            self._configurations[UnixRemote.connection_hops][UnixRemote.unix_remote_root][UnixRemote.unix_remote][
-                "command_params"]["expected_prompt"] = \
-                self._configurations[UnixRemote.connection_hops][UnixRemote.unix_local][UnixRemote.unix_remote][
-                    "command_params"]["expected_prompt"]
+                self._configurations[UnixRemote.connection_hops][UnixRemote.unix_remote_root][UnixRemote.unix_remote][
+                    "command_params"]["expected_prompt"] = \
+                    self._configurations[UnixRemote.connection_hops][UnixRemote.proxy_pc][UnixRemote.unix_remote][
+                        "command_params"]["expected_prompt"]
+            else:
+                self._configurations[UnixRemote.connection_hops][UnixRemote.unix_remote_root][UnixRemote.unix_remote][
+                    "command_params"]["expected_prompt"] = \
+                    self._configurations[UnixRemote.connection_hops][UnixRemote.unix_local][UnixRemote.unix_remote][
+                        "command_params"]["expected_prompt"]
+        except KeyError as ke:
+            raise DeviceFailure(
+                device=self.__class__.__name__,
+                message=f"Wrong configuration. Cannot get prompts. {ke} {repr(ke)}"
+            )
 
     @mark_to_call_base_class_method_with_same_name
     def _get_default_sm_configuration_with_proxy_pc(self):

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name='moler',
-    version='4.0.0',
+    version='4.0.1',
     description='Moler is a library for working with terminals, mainly for automated tests',  # Required
     long_description=long_description,
     long_description_content_type='text/markdown',