tests: Fix ap_wps_conf_chan14 false negative by using common finalizer

ap_wps_conf_chan14 fails with this message.

---------------
wlan0: Country code not reset back to 00: is JP
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:50 +09:00 committed by Jouni Malinen
parent 794d35a4e1
commit 207fe29dc7

View file

@ -41,7 +41,7 @@ import hwsim_utils
import hostapd import hostapd
from wpasupplicant import WpaSupplicant from wpasupplicant import WpaSupplicant
from utils import HwsimSkip, alloc_fail, fail_test, skip_with_fips from utils import HwsimSkip, alloc_fail, fail_test, skip_with_fips
from utils import wait_fail_trigger from utils import wait_fail_trigger, clear_regdom
from test_ap_eap import int_eap_server_params from test_ap_eap import int_eap_server_params
def wps_start_ap(apdev, ssid="test-wps-conf"): def wps_start_ap(apdev, ssid="test-wps-conf"):
@ -293,10 +293,7 @@ def test_ap_wps_conf_chan14(dev, apdev):
raise Exception("Device name not available in STA command") raise Exception("Device name not available in STA command")
finally: finally:
dev[0].request("DISCONNECT") dev[0].request("DISCONNECT")
if hapd: clear_regdom(hapd, dev)
hapd.request("DISABLE")
subprocess.call(['iw', 'reg', 'set', '00'])
dev[0].flush_scan_cache()
@remote_compatible @remote_compatible
def test_ap_wps_twice(dev, apdev): def test_ap_wps_twice(dev, apdev):