aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2014-10-28 12:01:16 (GMT)
committerJouni Malinen <j@w1.fi>2014-10-28 12:01:16 (GMT)
commit4fb26cee955ce51a843973cd823340d10028a046 (patch)
tree95434ecb06cb3125aec3b35417bec97f4d383568 /tests
parent3586d55a5d2d2af4fabf85ae72ceb5af6897871c (diff)
downloadhostap-4fb26cee955ce51a843973cd823340d10028a046.zip
hostap-4fb26cee955ce51a843973cd823340d10028a046.tar.gz
hostap-4fb26cee955ce51a843973cd823340d10028a046.tar.bz2
tests: Remove ap_ht40_csa and ap_ht40_csa3 workarounds
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>
Diffstat (limited to 'tests')
-rw-r--r--tests/hwsim/test_ap_ht.py24
1 files changed, 4 insertions, 20 deletions
diff --git a/tests/hwsim/test_ap_ht.py b/tests/hwsim/test_ap_ht.py
index 7fcbc54..310001f 100644
--- a/tests/hwsim/test_ap_ht.py
+++ b/tests/hwsim/test_ap_ht.py
@@ -620,11 +620,7 @@ def test_ap_ht40_csa(dev, apdev):
raise Exception("Unexpected channel in CSA finished event")
ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
if ev is not None:
- # This looks like a mac80211/cfg80211 bug - don't record FAIL until
- # 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)
+ raise Exception("Unexpected STA disconnection during CSA")
hwsim_utils.test_connectivity(dev[0], hapd)
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")
ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
if ev is not None:
- # This looks like a mac80211/cfg80211 bug - don't record FAIL until
- # 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)
+ raise Exception("Unexpected STA disconnection during CSA")
hwsim_utils.test_connectivity(dev[0], hapd)
finally:
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")
ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
if ev is not None:
- # This looks like a mac80211/cfg80211 bug - don't record FAIL until
- # 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)
+ raise Exception("Unexpected STA disconnection during CSA")
hwsim_utils.test_connectivity(dev[0], hapd)
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")
ev = dev[0].wait_event(["CTRL-EVENT-DISCONNECTED"], timeout=0.5)
if ev is not None:
- # This looks like a mac80211/cfg80211 bug - don't record FAIL until
- # 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)
+ raise Exception("Unexpected STA disconnection during CSA")
hwsim_utils.test_connectivity(dev[0], hapd)
finally:
subprocess.call(['sudo', 'iw', 'reg', 'set', '00'])