From 207fe29dc796c2d5cd0278678325fa7848e1c830 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Tue, 25 Jun 2019 10:50:50 +0900 Subject: [PATCH] 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 --- tests/hwsim/test_ap_wps.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/hwsim/test_ap_wps.py b/tests/hwsim/test_ap_wps.py index c5be55358..49d848757 100644 --- a/tests/hwsim/test_ap_wps.py +++ b/tests/hwsim/test_ap_wps.py @@ -41,7 +41,7 @@ import hwsim_utils import hostapd from wpasupplicant import WpaSupplicant 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 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") finally: dev[0].request("DISCONNECT") - if hapd: - hapd.request("DISABLE") - subprocess.call(['iw', 'reg', 'set', '00']) - dev[0].flush_scan_cache() + clear_regdom(hapd, dev) @remote_compatible def test_ap_wps_twice(dev, apdev):