tests: Fix rrm_beacon_req_table_vht false negative by using common finalizer

rrm_beacon_req_table_vht fails with this message.

---------------
wlan0: Country code not reset back to 00: is FI
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:50:47 +09:00 committed by Jouni Malinen
parent 6e450fbdbe
commit dcaf962f69

View file

@ -17,6 +17,7 @@ import time
import hostapd import hostapd
from wpasupplicant import WpaSupplicant from wpasupplicant import WpaSupplicant
from utils import HwsimSkip, alloc_fail, fail_test, wait_fail_trigger from utils import HwsimSkip, alloc_fail, fail_test, wait_fail_trigger
from utils import disable_hapd, clear_regdom_dev
from test_ap_ht import clear_scan_cache from test_ap_ht import clear_scan_cache
from remotehost import remote_compatible from remotehost import remote_compatible
from test_ap_vht import vht_supported from test_ap_vht import vht_supported
@ -1254,10 +1255,9 @@ def test_rrm_beacon_req_table_vht(dev, apdev):
raise raise
finally: finally:
dev[0].request("DISCONNECT") dev[0].request("DISCONNECT")
if hapd: disable_hapd(hapd)
hapd.request("DISABLE") disable_hapd(hapd2)
subprocess.call(['iw', 'reg', 'set', '00']) clear_regdom_dev(dev)
dev[0].flush_scan_cache()
@remote_compatible @remote_compatible
def test_rrm_beacon_req_active(dev, apdev): def test_rrm_beacon_req_active(dev, apdev):