tests: Fix ap_acs_vht false negative by using common finalizer

ap_acs_vht fails with this message:

---------------
wlan0: Country code not reset back to 00: is US
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:47 +09:00 committed by Jouni Malinen
parent 07b60dfa42
commit ccbd5a64bc

View file

@ -212,12 +212,7 @@ def test_ap_acs_vht(dev, apdev):
dev[0].connect("test-acs", psk="12345678", scan_freq=freq) dev[0].connect("test-acs", psk="12345678", scan_freq=freq)
dev[0].wait_regdom(country_ie=True) dev[0].wait_regdom(country_ie=True)
finally: finally:
if hapd: clear_regdom(hapd, dev)
hapd.request("DISABLE")
dev[0].disconnect_and_stop_scan()
hostapd.cmd_execute(apdev[0], ['iw', 'reg', 'set', '00'])
dev[0].wait_event(["CTRL-EVENT-REGDOM-CHANGE"], timeout=0.5)
dev[0].flush_scan_cache()
def test_ap_acs_vht40(dev, apdev): def test_ap_acs_vht40(dev, apdev):
"""Automatic channel selection for VHT40""" """Automatic channel selection for VHT40"""