From 2fa2b90aaf8243ee50c50d866ff9f45c9d6cd81b Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 31 Dec 2018 17:14:01 +0200 Subject: [PATCH] tests: Clear regulatory setting in ap_ht_op_class_* more robustly Avoid exiting the test case with regulatory domain set to something else than 00 (world roaming). Signed-off-by: Jouni Malinen --- tests/hwsim/test_ap_ht.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/hwsim/test_ap_ht.py b/tests/hwsim/test_ap_ht.py index 59b4ac679..c0a16c1c7 100644 --- a/tests/hwsim/test_ap_ht.py +++ b/tests/hwsim/test_ap_ht.py @@ -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]) if rx_opclass != 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: - 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): """HT20 on operationg class 81"""