From 4ab1ac90b4344e6b5d814a5c2efd19cea2e8882a Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Tue, 25 Jun 2019 10:51:01 +0900 Subject: [PATCH] tests: Fix ap_vht_tkip false negative by using common finalizer ap_vht_tkip 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_ap_vht.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/hwsim/test_ap_vht.py b/tests/hwsim/test_ap_vht.py index a5a13fdfc..02b068f47 100644 --- a/tests/hwsim/test_ap_vht.py +++ b/tests/hwsim/test_ap_vht.py @@ -1067,10 +1067,7 @@ def test_ap_vht_tkip(dev, apdev): raise 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_ap_vht_40_fallback_to_20(devs, apdevs): """VHT and 40 MHz channel configuration falling back to 20 MHz"""