From 1ae044f77d4af922db7dbe813e41787ac3f37ba1 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Thu, 30 May 2019 17:05:54 +0900 Subject: [PATCH] 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 --- tests/hwsim/test_nfc_wps.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/hwsim/test_nfc_wps.py b/tests/hwsim/test_nfc_wps.py index bf17a8584..74476852b 100644 --- a/tests/hwsim/test_nfc_wps.py +++ b/tests/hwsim/test_nfc_wps.py @@ -13,7 +13,7 @@ logger = logging.getLogger() import hwsim_utils 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): status = sta.get_status() @@ -306,11 +306,7 @@ def test_nfc_wps_handover_5ghz(dev, apdev): dev[0].wait_connected(timeout=30) check_wpa2_connection(dev[0], apdev[0], hapd, ssid) 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) def test_nfc_wps_handover_chan14(dev, apdev): """Connect to WPS AP with NFC connection handover on channel 14"""