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

tests: Clear regulatory setting in ap_ht_op_class_* more robustly

Browse source 
Avoid exiting the test case with regulatory domain set to something else
than 00 (world roaming).

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2018-12-31 17:14:01 +02:00
parent fea49f8f93
commit 2fa2b90aaf
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/hwsim/test_ap_ht.py
View file

@ -1334,8 +1334,14 @@ def run_op_class(dev, apdev, hw_mode, channel, country, ht_capab, sec_chan,
rx_opclass, = struct.unpack('B', ie[59][0:1]) rx_opclass, = struct.unpack('B', ie[59][0:1])
if rx_opclass != opclass: if rx_opclass != opclass:
raise Exception("Unexpected operating class: %d" % rx_opclass) raise Exception("Unexpected operating class: %d" % rx_opclass)
hapd.disable()
dev[0].request("REMOVE_NETWORK all")
dev[0].request("ABORT_SCAN")
dev[0].wait_disconnected()
dev[0].dump_monitor()
finally: finally:
set_world_reg(apdev[0], None, None) set_world_reg(apdev[0], None, dev[0])
time.sleep(0.1)
def test_ap_ht_op_class_81(dev, apdev): def test_ap_ht_op_class_81(dev, apdev):
"""HT20 on operationg class 81""" """HT20 on operationg class 81"""