From dcaf962f69fc5822293b5b217fb01fafba060b81 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Tue, 25 Jun 2019 10:50:47 +0900 Subject: [PATCH] tests: Fix rrm_beacon_req_table_vht false negative by using common finalizer rrm_beacon_req_table_vht 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_rrm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/test_rrm.py b/tests/hwsim/test_rrm.py index 1ac66fe23..e460533a8 100644 --- a/tests/hwsim/test_rrm.py +++ b/tests/hwsim/test_rrm.py @@ -17,6 +17,7 @@ import time import hostapd from wpasupplicant import WpaSupplicant from utils import HwsimSkip, alloc_fail, fail_test, wait_fail_trigger +from utils import disable_hapd, clear_regdom_dev from test_ap_ht import clear_scan_cache from remotehost import remote_compatible from test_ap_vht import vht_supported @@ -1254,10 +1255,9 @@ def test_rrm_beacon_req_table_vht(dev, apdev): raise finally: dev[0].request("DISCONNECT") - if hapd: - hapd.request("DISABLE") - subprocess.call(['iw', 'reg', 'set', '00']) - dev[0].flush_scan_cache() + disable_hapd(hapd) + disable_hapd(hapd2) + clear_regdom_dev(dev) @remote_compatible def test_rrm_beacon_req_active(dev, apdev):