jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Fix concurrent_autogo_crossconnect to use list of events with wait_event()

Browse source 
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2019-08-07 12:55:50 +03:00 committed by Jouni Malinen
parent 79b44113ec
commit 0e2605b948
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/hwsim/test_p2p_concurrency.py
View file

@ -103,7 +103,7 @@ def test_concurrent_autogo_crossconnect(dev, apdev):
dev[0].global_request("SET p2p_no_group_iface 0") dev[0].global_request("SET p2p_no_group_iface 0")
dev[0].p2p_start_go(no_event_clear=True) dev[0].p2p_start_go(no_event_clear=True)
ev = dev[0].wait_global_event("P2P-CROSS-CONNECT-ENABLE", timeout=10) ev = dev[0].wait_global_event(["P2P-CROSS-CONNECT-ENABLE"], timeout=10)
if ev is None: if ev is None:
raise Exception("Timeout on cross connection enabled event") raise Exception("Timeout on cross connection enabled event")
if dev[0].group_ifname + " " + dev[0].ifname not in ev: if dev[0].group_ifname + " " + dev[0].ifname not in ev:
@ -111,7 +111,7 @@ def test_concurrent_autogo_crossconnect(dev, apdev):
dev[0].dump_monitor() dev[0].dump_monitor()
dev[0].global_request("P2P_SET cross_connect 0") dev[0].global_request("P2P_SET cross_connect 0")
ev = dev[0].wait_global_event("P2P-CROSS-CONNECT-DISABLE", timeout=10) ev = dev[0].wait_global_event(["P2P-CROSS-CONNECT-DISABLE"], timeout=10)
if ev is None: if ev is None:
raise Exception("Timeout on cross connection disabled event") raise Exception("Timeout on cross connection disabled event")
if dev[0].group_ifname + " " + dev[0].ifname not in ev: if dev[0].group_ifname + " " + dev[0].ifname not in ev:
@ -120,14 +120,14 @@ def test_concurrent_autogo_crossconnect(dev, apdev):
dev[0].global_request("P2P_SET cross_connect 1") dev[0].global_request("P2P_SET cross_connect 1")
dev[0].p2p_start_go(no_event_clear=True) dev[0].p2p_start_go(no_event_clear=True)
ev = dev[0].wait_global_event("P2P-CROSS-CONNECT-ENABLE", timeout=10) ev = dev[0].wait_global_event(["P2P-CROSS-CONNECT-ENABLE"], timeout=10)
if ev is None: if ev is None:
raise Exception("Timeout on cross connection enabled event") raise Exception("Timeout on cross connection enabled event")
if dev[0].group_ifname + " " + dev[0].ifname not in ev: if dev[0].group_ifname + " " + dev[0].ifname not in ev:
raise Exception("Unexpected interfaces: " + ev) raise Exception("Unexpected interfaces: " + ev)
dev[0].dump_monitor() dev[0].dump_monitor()
dev[0].remove_group() dev[0].remove_group()
ev = dev[0].wait_global_event("P2P-CROSS-CONNECT-DISABLE", timeout=10) ev = dev[0].wait_global_event(["P2P-CROSS-CONNECT-DISABLE"], timeout=10)
if ev is None: if ev is None:
raise Exception("Timeout on cross connection disabled event") raise Exception("Timeout on cross connection disabled event")
dev[0].global_request("P2P_SET cross_connect 0") dev[0].global_request("P2P_SET cross_connect 0")