Merge remote-tracking branch 'origin/main' into proxy_pc3

nokia · Oct 30, 2024 · c3b1026 · c3b1026
2 parents 8c8d597 + 73b4d49
commit c3b1026
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/moler/cmd/commandtextualgeneric.py b/moler/cmd/commandtextualgeneric.py
@@ -115,7 +115,7 @@ def __init__(
         )
         self.debug_data_received = False  # Set True to log as hex all data received by command in data_received
         self.re_fail = (
-            None  # Regex to failure the command if it occurrs in the command output
+            None  # Regex to failure the command if it occurs in the command output
         )
 
         if not self._newline_chars:
@@ -645,7 +645,7 @@ def failure_indiction(self, line: str, is_full_line: bool) -> None:
         if self.is_failure_indication(line=line, is_full_line=is_full_line):
             if self._is_failure_exception(line=line, is_full_line=is_full_line) is False:
                 self.set_exception(
-                    CommandFailure(self, f"command failed in line '{line}'")
+                    CommandFailure(self, f"command failed in the command output line '{line}'.")
                 )
 
     def _is_failure_exception(self, line: str, is_full_line: bool) -> bool:

diff --git a/moler/cmd/unix/iperf.py b/moler/cmd/unix/iperf.py
@@ -90,7 +90,7 @@ def _command_failure(self, line):
         if self._regex_helper.search_compiled(Iperf._re_command_failure, line):
             self.set_exception(
                 CommandFailure(
-                    self, f"ERROR: {self._regex_helper.group('FAILURE_MSG')}"
+                    self, f"ERROR: found in command output: \"{self._regex_helper.group('FAILURE_MSG')}\""
                 )
             )
             raise ParsingDone

diff --git a/moler/cmd/unix/iperf2.py b/moler/cmd/unix/iperf2.py
@@ -277,7 +277,7 @@ def _command_failure(self, line):
         if self._regex_helper.search_compiled(Iperf2._re_command_failure, line):
             self.set_exception(
                 CommandFailure(
-                    self, f"ERROR: {self._regex_helper.group('FAILURE_MSG')}"
+                    self, f"ERROR: found in command output: \"{self._regex_helper.group('FAILURE_MSG')}\""
                 )
             )
             raise ParsingDone