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

tests: Make ap_csa_disable more robust

Browse source 
This test case was failing frequently due to the station not being able
to connect back to the AP if the interrupted channel switch ended up
moving the AP to the new channel anyway on restart. Scan both possible
channels to allow the AP to be found in either case.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-05-05 00:40:57 +03:00
parent b756cd4959
commit 4abaf4df84
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/hwsim/test_ap_csa.py
View file

@ -13,12 +13,12 @@ import hwsim_utils
import hostapd import hostapd
from utils import HwsimSkip from utils import HwsimSkip
def connect(dev, apdev, **kwargs): def connect(dev, apdev, scan_freq="2412", **kwargs):
params = {"ssid": "ap-csa", params = {"ssid": "ap-csa",
"channel": "1"} "channel": "1"}
params.update(kwargs) params.update(kwargs)
ap = hostapd.add_ap(apdev[0], params) ap = hostapd.add_ap(apdev[0], params)
dev.connect("ap-csa", key_mgmt="NONE", scan_freq="2412") dev.connect("ap-csa", key_mgmt="NONE", scan_freq=scan_freq)
return ap return ap
def switch_channel(ap, count, freq): def switch_channel(ap, count, freq):
@ -187,7 +187,7 @@ def test_ap_csa_invalid(dev, apdev):
def test_ap_csa_disable(dev, apdev): def test_ap_csa_disable(dev, apdev):
"""AP Channel Switch and DISABLE command before completion""" """AP Channel Switch and DISABLE command before completion"""
csa_supported(dev[0]) csa_supported(dev[0])
ap = connect(dev[0], apdev) ap = connect(dev[0], apdev, scan_freq="2412 2462")
if "OK" not in ap.request("CHAN_SWITCH 10 2462"): if "OK" not in ap.request("CHAN_SWITCH 10 2462"):
raise Exception("CHAN_SWITCH failed") raise Exception("CHAN_SWITCH failed")
ap.disable() ap.disable()