From 794d35a4e15cbf84f153e0a3faab4f5b607b1377 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Tue, 25 Jun 2019 10:50:49 +0900 Subject: [PATCH] tests: Fix ap_acs_vht160_scan_disable false negative by using common finalizer ap_acs_vht160_scan_disable fails with this message. --------------- wlan0: Country code not reset back to 00: is ZA wlan0: Country code cleared back to 00 --------------- This patch fixes the issue. Signed-off-by: Masashi Honma --- tests/hwsim/test_ap_acs.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/test_ap_acs.py b/tests/hwsim/test_ap_acs.py index 2a5e1dc5f..db0828467 100644 --- a/tests/hwsim/test_ap_acs.py +++ b/tests/hwsim/test_ap_acs.py @@ -9,7 +9,7 @@ logger = logging.getLogger() import time import hostapd -from utils import skip_with_fips, alloc_fail, fail_test, HwsimSkip +from utils import skip_with_fips, alloc_fail, fail_test, HwsimSkip, clear_regdom from test_ap_ht import clear_scan_cache from test_dfs import wait_dfs_event @@ -314,9 +314,7 @@ def test_ap_acs_vht160_scan_disable(dev, apdev): params['ieee80211h'] = '1' hapd = hostapd.add_ap(apdev[0], params, wait_enabled=False) time.sleep(3) - hapd.request("DISABLE") - hostapd.cmd_execute(apdev[0], ['iw', 'reg', 'set', '00']) - time.sleep(0.1) + clear_regdom(hapd, dev) def test_ap_acs_bias(dev, apdev): """Automatic channel selection with bias values"""