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

tests: Remove ap_ht40_csa and ap_ht40_csa3 workarounds

Browse source 
The issue in mac80211 was identified and proposed fix is now available,
so remove the workaround here and start reporting failures from
unexpected disconnection during CSA.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-10-28 14:01:16 +02:00
parent 3586d55a5d
commit 4fb26cee95
1 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tests/hwsim/test_ap_ht.py
View file

@ -620,11 +620,7 @@ def test_ap_ht40_csa(dev, apdev):
raise Exception("Unexpected channel in CSA finished event") raise Exception("Unexpected channel in CSA finished event")
ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5) ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
if ev is not None: if ev is not None:
# This looks like a mac80211/cfg80211 bug - don't record FAIL until raise Exception("Unexpected STA disconnection during CSA")
# that gets fixed.
#raise Exception("Unexpected STA disconnection during CSA")
logger.info("Unexpected STA disconnection during CSA")
dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=5)
hwsim_utils.test_connectivity(dev[0], hapd) hwsim_utils.test_connectivity(dev[0], hapd)
hapd.request("CHAN_SWITCH 5 5180 ht sec_channel_offset=1 bandwidth=40") hapd.request("CHAN_SWITCH 5 5180 ht sec_channel_offset=1 bandwidth=40")
@ -635,11 +631,7 @@ def test_ap_ht40_csa(dev, apdev):
raise Exception("Unexpected channel in CSA finished event") raise Exception("Unexpected channel in CSA finished event")
ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5) ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
if ev is not None: if ev is not None:
# This looks like a mac80211/cfg80211 bug - don't record FAIL until raise Exception("Unexpected STA disconnection during CSA")
# that gets fixed.
#raise Exception("Unexpected STA disconnection during CSA")
logger.info("Unexpected STA disconnection during CSA")
dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=5)
hwsim_utils.test_connectivity(dev[0], hapd) hwsim_utils.test_connectivity(dev[0], hapd)
finally: finally:
subprocess.call(['sudo', 'iw', 'reg', 'set', '00']) subprocess.call(['sudo', 'iw', 'reg', 'set', '00'])
@ -708,11 +700,7 @@ def test_ap_ht40_csa3(dev, apdev):
raise Exception("Unexpected channel in CSA finished event") raise Exception("Unexpected channel in CSA finished event")
ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5) ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
if ev is not None: if ev is not None:
# This looks like a mac80211/cfg80211 bug - don't record FAIL until raise Exception("Unexpected STA disconnection during CSA")
# that gets fixed.
#raise Exception("Unexpected STA disconnection during CSA")
logger.info("Unexpected STA disconnection during CSA")
dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=5)
hwsim_utils.test_connectivity(dev[0], hapd) hwsim_utils.test_connectivity(dev[0], hapd)
hapd.request("CHAN_SWITCH 5 5180 ht sec_channel_offset=1 bandwidth=40") hapd.request("CHAN_SWITCH 5 5180 ht sec_channel_offset=1 bandwidth=40")
@ -723,11 +711,7 @@ def test_ap_ht40_csa3(dev, apdev):
raise Exception("Unexpected channel in CSA finished event") raise Exception("Unexpected channel in CSA finished event")
ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5) ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
if ev is not None: if ev is not None:
# This looks like a mac80211/cfg80211 bug - don't record FAIL until raise Exception("Unexpected STA disconnection during CSA")
# that gets fixed.
#raise Exception("Unexpected STA disconnection during CSA")
logger.info("Unexpected STA disconnection during CSA")
dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=5)
hwsim_utils.test_connectivity(dev[0], hapd) hwsim_utils.test_connectivity(dev[0], hapd)
finally: finally:
subprocess.call(['sudo', 'iw', 'reg', 'set', '00']) subprocess.call(['sudo', 'iw', 'reg', 'set', '00'])