Merge pull request #13879 from donaldsharp/fix_check_ping_again

tests: Fix broken check_ping run_and_expect semantics
This commit is contained in:
Donatas Abraitis 2023-06-29 22:57:26 +03:00 committed by GitHub
commit c8732b6904
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -250,7 +250,8 @@ def check_ping(name, dest_addr, expect_connected):
tgen = get_topogen()
output = tgen.gears[name].run("ping {} -c 1 -w 1".format(dest_addr))
logger.info(output)
assert match in output, "ping fail"
if match not in output:
return "ping fail"
match = ", {} packet loss".format("0%" if expect_connected else "100%")
logger.info("[+] check {} {} {}".format(name, dest_addr, match))