x/tobiko
Code Issues Proposed changes

Fix error when iperf3 client add some error warning in the report

Browse Source 
Test could fail if some log is added to the end of the report
due to no json format

Change-Id: I396a99f5593dbb19366e9af3c177e6af592661e5
This commit is contained in:
ccamposr 2025-03-12 18:09:42 +01:00
parent 84ff08d96f
commit ba14b305d5
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tobiko/shell/iperf3/_execute.py
View File

@ -253,6 +253,9 @@ def check_iperf3_client_results(address: typing.Union[str, netaddr.IPAddress],
f'Error: {err}')
return
# avoid test failure is iperf advertise some error/warning
iperf_log_raw = remove_log_lines_end_json_str(iperf_log_raw)
LOG.debug(f'iperf log raw: {iperf_log_raw} ')
if not iperf_log_raw:
if config.is_prevent_create():
@ -292,6 +295,17 @@ def check_iperf3_client_results(address: typing.Union[str, netaddr.IPAddress],
CONF.tobiko.rhosp.max_total_breaks_allowed)
def remove_log_lines_end_json_str(json_str: str) -> str:
lines = json_str.splitlines()
while lines:
if lines[-1].strip() == "}":
# Stop when we find }
break
# Remove last line, remove possible error logs
lines.pop()
return "\n".join(lines)
def iperf3_client_alive(address: typing.Union[str, netaddr.IPAddress], # noqa; pylint: disable=W0613
ssh_client: ssh.SSHClientType = None,
**kwargs) -> bool: