tests: Fix nfc_wps_handover_5ghz false negative by using common finalizer

nfc_wps_handover_5ghz 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-05-30 17:05:54 +09:00 committed by Jouni Malinen
parent 7c2102acbb
commit 1ae044f77d

View file

@ -13,7 +13,7 @@ logger = logging.getLogger()
import hwsim_utils import hwsim_utils
import hostapd import hostapd
from utils import alloc_fail, fail_test from utils import alloc_fail, fail_test, clear_regdom
def check_wpa2_connection(sta, ap, hapd, ssid, mixed=False): def check_wpa2_connection(sta, ap, hapd, ssid, mixed=False):
status = sta.get_status() status = sta.get_status()
@ -306,11 +306,7 @@ def test_nfc_wps_handover_5ghz(dev, apdev):
dev[0].wait_connected(timeout=30) dev[0].wait_connected(timeout=30)
check_wpa2_connection(dev[0], apdev[0], hapd, ssid) check_wpa2_connection(dev[0], apdev[0], hapd, ssid)
finally: finally:
dev[0].request("DISCONNECT") clear_regdom(hapd, dev)
if hapd:
hapd.request("DISABLE")
subprocess.call(['iw', 'reg', 'set', '00'])
dev[0].flush_scan_cache()
def test_nfc_wps_handover_chan14(dev, apdev): def test_nfc_wps_handover_chan14(dev, apdev):
"""Connect to WPS AP with NFC connection handover on channel 14""" """Connect to WPS AP with NFC connection handover on channel 14"""