]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
tests: Fix ap_acs_vht160_scan_disable false negative by using common finalizer
authorMasashi Honma <masashi.honma@gmail.com>
Tue, 25 Jun 2019 01:50:49 +0000 (10:50 +0900)
committerJouni Malinen <j@w1.fi>
Wed, 26 Jun 2019 17:42:20 +0000 (20:42 +0300)
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 <masashi.honma@gmail.com>
tests/hwsim/test_ap_acs.py

index 2a5e1dc5f67a7318a45e1f421885d7364b9f6baf..db0828467324e4cf12137262642ca02ce8eed38e 100644 (file)
@@ -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"""