From 07b60dfa42c3a08f1810ebe18e53c554dfa9e65c Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Thu, 27 Jun 2019 14:44:46 +0900 Subject: [PATCH] tests: Fix ap_acs_5ghz_40mhz false negative by using common finalizer ap_acs_5ghz_40mhz fails with this message: --------------- wlan0: Country code not reset back to 00: is US wlan0: Country code cleared back to 00 --------------- hostap commit 91b6eba7732354ed3dfe0aa9715dc4c0746e3336 'Move MAC address randomization enable/disable to helper functions'. wireless-testing commit 66c112cbd1d44d05322bb4eef908c82a68adbb5e tag: wt-2019-06-26. This patch fixes the issue. Signed-off-by: Masashi Honma --- tests/hwsim/test_ap_acs.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/hwsim/test_ap_acs.py b/tests/hwsim/test_ap_acs.py index 99b786e3d..623733056 100644 --- a/tests/hwsim/test_ap_acs.py +++ b/tests/hwsim/test_ap_acs.py @@ -185,12 +185,7 @@ def test_ap_acs_5ghz_40mhz(dev, apdev): dev[0].connect("test-acs", psk="12345678", scan_freq=freq) dev[0].wait_regdom(country_ie=True) finally: - if hapd: - hapd.request("DISABLE") - dev[0].disconnect_and_stop_scan() - hostapd.cmd_execute(apdev[0], ['iw', 'reg', 'set', '00']) - dev[0].wait_event(["CTRL-EVENT-REGDOM-CHANGE"], timeout=0.5) - dev[0].flush_scan_cache() + clear_regdom(hapd, dev) def test_ap_acs_vht(dev, apdev): """Automatic channel selection for VHT"""