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

tests: Wait for CTRL-EVENT-CHANNEL-SWITCH event in ap_csa tests

Browse source 
This verifies that the channel switch is reported by the station and
replaces the fixed sleep before a traffic test by wait for the actual
switch operation to complete.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2016-06-27 20:24:52 +03:00
parent 37fd0be2d3
commit f9442f2967
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/hwsim/test_ap_csa.py
View file

@ -27,7 +27,13 @@ def switch_channel(ap, count, freq):
raise Exception("CSA finished event timed out") raise Exception("CSA finished event timed out")
if "freq=" + str(freq) not in ev: if "freq=" + str(freq) not in ev:
raise Exception("Unexpected channel in CSA finished event") raise Exception("Unexpected channel in CSA finished event")
time.sleep(0.1)
def wait_channel_switch(dev, freq):
ev = dev.wait_event(["CTRL-EVENT-CHANNEL-SWITCH"], timeout=5)
if ev is None:
raise Exception("Channel switch not reported")
if "freq=%d" % freq not in ev:
raise Exception("Unexpected frequency: " + ev)
# This function checks whether the provided dev, which may be either # This function checks whether the provided dev, which may be either
# WpaSupplicant or Hostapd supports CSA. # WpaSupplicant or Hostapd supports CSA.
@ -43,6 +49,7 @@ def test_ap_csa_1_switch(dev, apdev):
hwsim_utils.test_connectivity(dev[0], ap) hwsim_utils.test_connectivity(dev[0], ap)
switch_channel(ap, 10, 2462) switch_channel(ap, 10, 2462)
wait_channel_switch(dev[0], 2462)
hwsim_utils.test_connectivity(dev[0], ap) hwsim_utils.test_connectivity(dev[0], ap)
def test_ap_csa_2_switches(dev, apdev): def test_ap_csa_2_switches(dev, apdev):
@ -52,8 +59,10 @@ def test_ap_csa_2_switches(dev, apdev):
hwsim_utils.test_connectivity(dev[0], ap) hwsim_utils.test_connectivity(dev[0], ap)
switch_channel(ap, 10, 2462) switch_channel(ap, 10, 2462)
wait_channel_switch(dev[0], 2462)
hwsim_utils.test_connectivity(dev[0], ap) hwsim_utils.test_connectivity(dev[0], ap)
switch_channel(ap, 10, 2412) switch_channel(ap, 10, 2412)
wait_channel_switch(dev[0], 2412)
hwsim_utils.test_connectivity(dev[0], ap) hwsim_utils.test_connectivity(dev[0], ap)
def test_ap_csa_1_switch_count_0(dev, apdev): def test_ap_csa_1_switch_count_0(dev, apdev):
@ -109,6 +118,7 @@ def test_ap_csa_1_switch_count_2(dev, apdev):
hwsim_utils.test_connectivity(dev[0], ap) hwsim_utils.test_connectivity(dev[0], ap)
switch_channel(ap, 2, 2462) switch_channel(ap, 2, 2462)
wait_channel_switch(dev[0], 2462)
hwsim_utils.test_connectivity(dev[0], ap) hwsim_utils.test_connectivity(dev[0], ap)
def test_ap_csa_ecsa_only(dev, apdev): def test_ap_csa_ecsa_only(dev, apdev):
@ -118,6 +128,7 @@ def test_ap_csa_ecsa_only(dev, apdev):
hwsim_utils.test_connectivity(dev[0], ap) hwsim_utils.test_connectivity(dev[0], ap)
switch_channel(ap, 10, 2462) switch_channel(ap, 10, 2462)
wait_channel_switch(dev[0], 2462)
hwsim_utils.test_connectivity(dev[0], ap) hwsim_utils.test_connectivity(dev[0], ap)
def test_ap_csa_invalid(dev, apdev): def test_ap_csa_invalid(dev, apdev):