tests: Speed up wpas_mesh_gate_forwarding tshark operations

For some reason, running tshark in the test cases can take significant
time especially with UML time-travel. Optimize this by reducing the
number of times tshark needs to be executed in the loop.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-12-27 00:03:24 +02:00
parent 985718135f
commit 743b234902

View file

@ -1456,12 +1456,13 @@ def test_wpas_mesh_gate_forwarding(dev, apdev, p):
capfile = os.path.join(p['logdir'], "hwsim0.pcapng") capfile = os.path.join(p['logdir'], "hwsim0.pcapng")
filt = "wlan.sa==%s && wlan_mgt.fixed.mesh_addr5==%s" % (addr2, filt = "wlan.sa==%s && wlan_mgt.fixed.mesh_addr5==%s" % (addr2,
external_sta) external_sta)
for i in range(15): time.sleep(4)
for i in range(5):
da = run_tshark(capfile, filt, ["wlan.da"]) da = run_tshark(capfile, filt, ["wlan.da"])
if addr0 in da and addr1 in da: if addr0 in da and addr1 in da:
logger.debug("Frames seen in tshark iteration %d" % i) logger.debug("Frames seen in tshark iteration %d" % i)
break break
time.sleep(0.3) time.sleep(0.5)
if addr0 not in da: if addr0 not in da:
raise Exception("Frame to gate %s not observed" % addr0) raise Exception("Frame to gate %s not observed" % addr0)