From 77e16aacdef57a88e1e52c49950fdd45ae245bc4 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Tue, 25 Jun 2019 10:51:00 +0900 Subject: [PATCH] tests: Fix prefer_vht40 false negative by using common finalizer prefer_vht40 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 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/test_ap_vht.py b/tests/hwsim/test_ap_vht.py index d45062475..a5a13fdfc 100644 --- a/tests/hwsim/test_ap_vht.py +++ b/tests/hwsim/test_ap_vht.py @@ -962,10 +962,9 @@ def test_prefer_vht40(dev, apdev): raise Exception("Unexpected BSS1 est_throughput: " + est) finally: dev[0].request("DISCONNECT") - if hapd2: - hapd2.request("DISABLE") - subprocess.call(['iw', 'reg', 'set', '00']) - dev[0].flush_scan_cache() + disable_hapd(hapd) + disable_hapd(hapd2) + clear_regdom_dev(dev) def test_ap_vht80_pwr_constraint(dev, apdev): """VHT with 80 MHz channel width and local power constraint"""