Skip to content

Commit 3e10079

Browse files
review fix
1 parent eaf0609 commit 3e10079

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

moler/cmd/unix/iperf2.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@ def has_any_result(self) -> bool:
636636
:return: True if current_ret has collected any data. Otherwise False.
637637
"""
638638

639+
ret_value = False
639640
if not self._output_parsed:
640641
if '--version' in self.options:
641642
was_version = any(self._regex_helper.search_compiled(Iperf2._re_version, line) for line in self.current_ret["INFO"])
@@ -644,8 +645,8 @@ def has_any_result(self) -> bool:
644645
return was_version
645646
else:
646647
self._output_parsed = True # we don't exepect any specific data for this instance.
647-
return super(Iperf2, self).has_any_result()
648-
return False
648+
ret_value = super(Iperf2, self).has_any_result()
649+
return ret_value
649650

650651

651652
COMMAND_OUTPUT_version = """xyz@debian:~$ iperf --version

moler/cmd/unix/ping.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def _parse_trans_recv_loss(self, line):
109109
# 7 packets transmitted, 7 received, +6 duplicates, 0% packet loss, time 6142ms
110110
# 4 packets transmitted, 3 received, +1 errors, 25% packet loss, time 3008ms
111111
_re_trans_recv_loss_time_plus_errors = re.compile(
112-
r"(?P<PKTS_TRANS>\d+) packets transmitted, (?P<PKTS_RECV>\d+) received, \+?(?P<ERRORS>\d+) (?P<ERR_DUP>errors|duplicates), (?P<PKT_LOSS>\S+)% packet loss, time (?P<TIME>\d+)\s*(?P<UNIT>\w+)")
112+
r"(?P<PKTS_TRANS>\d+) packets transmitted, (?P<PKTS_RECV>\d+) received, \+?(?P<ERR_DUP_VAL>\d+) (?P<ERR_DUP>errors|duplicates), (?P<PKT_LOSS>\S+)% packet loss, time (?P<TIME>\d+)\s*(?P<UNIT>\w+)")
113113

114114
def _parse_trans_recv_loss_time_plus_errors(self, line):
115115
"""
@@ -122,7 +122,7 @@ def _parse_trans_recv_loss_time_plus_errors(self, line):
122122
self._regex_helper.group('PKTS_TRANS'))
123123
self.current_ret['packets_received'] = self._converter_helper.to_number(
124124
self._regex_helper.group('PKTS_RECV'))
125-
self.current_ret[self._regex_helper.group('ERR_DUP')] = self._converter_helper.to_number(self._regex_helper.group('ERRORS'))
125+
self.current_ret[self._regex_helper.group('ERR_DUP')] = self._converter_helper.to_number(self._regex_helper.group('ERR_DUP_VAL'))
126126
self.current_ret['packet_loss'] = self._converter_helper.to_number(self._regex_helper.group('PKT_LOSS'))
127127
self.current_ret['time'] = self._converter_helper.to_number(self._regex_helper.group('TIME'))
128128
self.current_ret['packets_time_unit'] = self._regex_helper.group('UNIT')

0 commit comments

Comments
 (0)