Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

03-single-hop-ipv6-icmp/task04: stop pingers after force-ping #180

Merged
merged 1 commit into from
Aug 4, 2020
Merged

03-single-hop-ipv6-icmp/task04: stop pingers after force-ping #180

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions 03-single-hop-ipv6-icmp/test_spec03.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import sys
import time

import pexpect
import pexpect.replwrap
import pytest

Expand Down Expand Up @@ -103,18 +104,23 @@ def test_task04(riot_ctrl, log_nodes):
ping_cmd = get_ping_cmd()

futures = []
for pinger in pingers:
if log_nodes:
pinger.child.logfile = sys.stdout
out = pinger.run_command("{ping_cmd} -f -s 1452 {pinged_addr}"
# pipe to /dev/null because output can go into
# MiB of data ;-)
" 2>&1 > /dev/null"
.format(ping_cmd=ping_cmd,
pinged_addr=pinged_addr),
async_=True, timeout=60 * 60)
futures.append(out)
timeout_futures(futures, 60 * 60)
try:
for pinger in pingers:
if log_nodes:
pinger.child.logfile = sys.stdout
out = pinger.run_command("{ping_cmd} -f -s 1452 {pinged_addr}"
# pipe to /dev/null because output can go
# into MiB of data ;-)
" 2>&1 > /dev/null"
.format(ping_cmd=ping_cmd,
pinged_addr=pinged_addr),
async_=True, timeout=60 * 60)
futures.append(out)
timeout_futures(futures, 60 * 60)
finally:
for pinger in pingers:
# interrupt prevailing `ping6`s
pinger.child.sendintr()

time.sleep(60)
assert pktbuf(node).is_empty()
Expand Down Expand Up @@ -172,9 +178,6 @@ def test_task06(riot_ctrl):

res = ping6(pinger, pinged_addr,
count=1000, interval=100, packet_size=2048)
if 1 <= res['stats']['packet_loss'] < 100:
pytest.xfail("1 <= packet_loss < 100; "
"this test is prone to fail in CI.")
assert res['stats']['packet_loss'] < 1
time.sleep(60)

Expand Down