tests: Use the group control interface in p2p_channel_avoid

Use the group control interface to wait for P2P-REMOVE-AND-REFORM-GROUP
as the event is a group event.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
This commit is contained in:
Ilan Peer 2015-02-05 20:30:58 -05:00 committed by Jouni Malinen
parent d4f2ba749e
commit da749dc579

View file

@ -173,7 +173,7 @@ def test_p2p_channel_avoid(dev):
ev = dev[0].wait_event(["CTRL-EVENT-AVOID-FREQ"], timeout=10) ev = dev[0].wait_event(["CTRL-EVENT-AVOID-FREQ"], timeout=10)
if ev is None: if ev is None:
raise Exception("No CTRL-EVENT-AVOID-FREQ event") raise Exception("No CTRL-EVENT-AVOID-FREQ event")
ev = dev[0].wait_event(["P2P-REMOVE-AND-REFORM-GROUP"], timeout=1) ev = dev[0].wait_group_event(["P2P-REMOVE-AND-REFORM-GROUP"], timeout=1)
if ev is not None: if ev is not None:
raise Exception("Unexpected P2P-REMOVE-AND-REFORM-GROUP event") raise Exception("Unexpected P2P-REMOVE-AND-REFORM-GROUP event")
@ -182,7 +182,8 @@ def test_p2p_channel_avoid(dev):
ev = dev[0].wait_event(["CTRL-EVENT-AVOID-FREQ"], timeout=10) ev = dev[0].wait_event(["CTRL-EVENT-AVOID-FREQ"], timeout=10)
if ev is None: if ev is None:
raise Exception("No CTRL-EVENT-AVOID-FREQ event") raise Exception("No CTRL-EVENT-AVOID-FREQ event")
ev = dev[0].wait_event(["P2P-REMOVE-AND-REFORM-GROUP"], timeout=10) ev = dev[0].wait_group_event(["P2P-REMOVE-AND-REFORM-GROUP"],
timeout=10)
if ev is None: if ev is None:
raise Exception("No P2P-REMOVE-AND-REFORM-GROUP event") raise Exception("No P2P-REMOVE-AND-REFORM-GROUP event")
finally: finally: