tests: Fix ap_vht_40_fallback_to_20 false negative by using common finalizer

ap_vht_40_fallback_to_20 fails with this message.

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

This patch fixes the issue.

Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
This commit is contained in:
Masashi Honma 2019-06-25 10:51:02 +09:00 committed by Jouni Malinen
parent 4ab1ac90b4
commit 44cc7df650

View file

@ -1093,12 +1093,7 @@ def test_ap_vht_40_fallback_to_20(devs, apdevs):
dev.wait_regdom(country_ie=True)
hwsim_utils.test_connectivity(dev, hapd)
finally:
if hapd:
hapd.request("DISABLE")
dev.disconnect_and_stop_scan()
subprocess.call(['iw', 'reg', 'set', '00'])
dev.wait_event(["CTRL-EVENT-REGDOM-CHANGE"], timeout=0.5)
dev.flush_scan_cache()
clear_regdom(hapd, devs)
def test_ap_vht80_to_24g_ht(dev, apdev):
"""VHT with 80 MHz channel width reconfigured to 2.4 GHz HT"""