Skip to content

Commit

Permalink
Readability (#550)
Browse files Browse the repository at this point in the history
* iperf readability

* CommandTextualGeneric
  • Loading branch information
marcin-usielski authored Oct 30, 2024
1 parent a40c5f0 commit 73b4d49
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions moler/cmd/commandtextualgeneric.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion moler/cmd/unix/iperf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion moler/cmd/unix/iperf2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 73b4d49

Please sign in to comment.