diff --git a/CHANGELOG.md b/CHANGELOG.md index 442c973a5..f2685de75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## moler 4.3.1 + * duplicates in ping + ## moler 4.3.0 * Command Crrl+C * Enhancement of MolerTimeout exception diff --git a/moler/cmd/unix/ctrl_c.py b/moler/cmd/unix/ctrl_c.py index 233104c7e..bd6a27869 100644 --- a/moler/cmd/unix/ctrl_c.py +++ b/moler/cmd/unix/ctrl_c.py @@ -33,7 +33,6 @@ def __init__(self, connection, prompt=None, expected_prompt=None, newline_chars= :param allowed_newline_after_prompt: If True then newline chars may occur after expected (target) prompt. :param prompt_after_login: prompt after login before send export PS1. If you do not change prompt exporting PS1 then leave it None. - :param allowed_newline_after_prompt: If True, allows newline after prompt. """ super(CtrlC, self).__init__(connection=connection, prompt=prompt, expected_prompt=expected_prompt, newline_chars=newline_chars, runner=runner, diff --git a/moler/cmd/unix/iperf2.py b/moler/cmd/unix/iperf2.py index 7326881e2..e9e412965 100644 --- a/moler/cmd/unix/iperf2.py +++ b/moler/cmd/unix/iperf2.py @@ -636,6 +636,7 @@ def has_any_result(self) -> bool: :return: True if current_ret has collected any data. Otherwise False. """ + ret_value = False if not self._output_parsed: if '--version' in self.options: was_version = any(self._regex_helper.search_compiled(Iperf2._re_version, line) for line in self.current_ret["INFO"]) @@ -644,7 +645,8 @@ def has_any_result(self) -> bool: return was_version else: self._output_parsed = True # we don't exepect any specific data for this instance. - return super(Iperf2, self).has_any_result() + ret_value = super(Iperf2, self).has_any_result() + return ret_value COMMAND_OUTPUT_version = """xyz@debian:~$ iperf --version diff --git a/moler/cmd/unix/ping.py b/moler/cmd/unix/ping.py index 7c9cc5adf..abae27fa7 100644 --- a/moler/cmd/unix/ping.py +++ b/moler/cmd/unix/ping.py @@ -4,7 +4,7 @@ """ __author__ = 'Julia Patacz, Marcin Usielski' -__copyright__ = 'Copyright (C) 2018-2024, Nokia' +__copyright__ = 'Copyright (C) 2018-2025, Nokia' __email__ = 'julia.patacz@nokia.com, marcin.usielski@nokia.com' import re @@ -106,9 +106,10 @@ def _parse_trans_recv_loss(self, line): self.current_ret['time_seconds'] = None raise ParsingDone + # 7 packets transmitted, 7 received, +6 duplicates, 0% packet loss, time 6142ms # 4 packets transmitted, 3 received, +1 errors, 25% packet loss, time 3008ms _re_trans_recv_loss_time_plus_errors = re.compile( - r"(?P\d+) packets transmitted, (?P\d+) received, \+?(?P\d+) errors, (?P\S+)% packet loss, time (?P