tests: Fix ap_vht160_no_dfs false negative by using common finalizer

ap_vht160_no_dfs fails with this message:

---------------
wlan0: Country code not reset back to 00: is ZA
wlan0: Country code cleared back to 00
---------------

hostap commit 91b6eba773
'Move MAC address randomization enable/disable to helper functions'.

wireless-testing commit 66c112cbd1d44d05322bb4eef908c82a68adbb5e
tag: wt-2019-06-26.

This patch fixes the issue.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2019-06-27 14:44:52 +09:00 committed by Jouni Malinen
parent cbe7e44d1b
commit 9cff5c320c

View file

@ -551,12 +551,7 @@ def run_ap_vht160_no_dfs(dev, apdev, channel, ht_capab):
raise HwsimSkip("80/160 MHz channel not supported in regulatory information") raise HwsimSkip("80/160 MHz channel not supported in regulatory information")
raise raise
finally: finally:
if hapd: clear_regdom(hapd, dev)
hapd.request("DISABLE")
dev[0].disconnect_and_stop_scan()
subprocess.call(['iw', 'reg', 'set', '00'])
dev[0].wait_event(["CTRL-EVENT-REGDOM-CHANGE"], timeout=0.5)
dev[0].flush_scan_cache()
def test_ap_vht160_no_ht40(dev, apdev): def test_ap_vht160_no_ht40(dev, apdev):
"""VHT with 160 MHz channel width and HT40 disabled""" """VHT with 160 MHz channel width and HT40 disabled"""