DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Make p2p_channel_avoid* more robust

Browse source 
Terminate the group explicitly before cleanup to avoid a race condition
between an automatically started scan to find the GO again and the scan
started to clear the scan cache.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2023-12-18 17:12:30 +02:00 • committed by Jouni Malinen
parent 48797ff87c
commit 94cb040021
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/hwsim/test_p2p_channel.py
View file

@ -186,6 +186,7 @@ def test_p2p_channel_avoid(dev):
timeout=10) timeout=10)
if ev is None: if ev is None:
raise Exception("No P2P-REMOVE-AND-REFORM-GROUP or AP-CSA-FINISHED event") raise Exception("No P2P-REMOVE-AND-REFORM-GROUP or AP-CSA-FINISHED event")
remove_group(dev[0], dev[1])
finally: finally:
set_country("00") set_country("00")
dev[0].request("DRIVER_EVENT AVOID_FREQUENCIES") dev[0].request("DRIVER_EVENT AVOID_FREQUENCIES")
@ -218,6 +219,7 @@ def test_p2p_channel_avoid2(dev):
ev = dev[0].wait_group_event(["AP-CSA-FINISHED"], timeout=1) ev = dev[0].wait_group_event(["AP-CSA-FINISHED"], timeout=1)
if ev is None: if ev is None:
raise Exception("No AP-CSA-FINISHED event seen") raise Exception("No AP-CSA-FINISHED event seen")
remove_group(dev[0], dev[1])
finally: finally:
set_country("00") set_country("00")
dev[0].request("DRIVER_EVENT AVOID_FREQUENCIES") dev[0].request("DRIVER_EVENT AVOID_FREQUENCIES")
@ -249,6 +251,7 @@ def test_p2p_channel_avoid3(dev):
ev = dev[0].wait_group_event(["AP-CSA-FINISHED"], timeout=1) ev = dev[0].wait_group_event(["AP-CSA-FINISHED"], timeout=1)
if ev is None: if ev is None:
raise Exception("No AP-CSA-FINISHED event seen") raise Exception("No AP-CSA-FINISHED event seen")
remove_group(dev[0], dev[1])
finally: finally:
set_country("00") set_country("00")
dev[0].request("DRIVER_EVENT AVOID_FREQUENCIES") dev[0].request("DRIVER_EVENT AVOID_FREQUENCIES")
@ -277,6 +280,7 @@ def test_p2p_channel_avoid4(dev):
sig = dev[1].group_request("SIGNAL_POLL").splitlines() sig = dev[1].group_request("SIGNAL_POLL").splitlines()
if "WIDTH=40 MHz" not in sig: if "WIDTH=40 MHz" not in sig:
raise Exception("Unexpected channel width: " + str(sig)) raise Exception("Unexpected channel width: " + str(sig))
remove_group(dev[0], dev[1])
finally: finally:
set_country("00") set_country("00")
dev[0].request("DRIVER_EVENT AVOID_FREQUENCIES") dev[0].request("DRIVER_EVENT AVOID_FREQUENCIES")