From 411b9e01a174684b62349e2517fed5fe29a221e2 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Tue, 25 Jun 2019 10:50:57 +0900 Subject: [PATCH] tests: Fix ap_vht160_no_ht40 false negative by using common finalizer ap_vht160_no_ht40 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 --- 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 7b5a78dad..fc7af3968 100644 --- a/tests/hwsim/test_ap_vht.py +++ b/tests/hwsim/test_ap_vht.py @@ -591,10 +591,7 @@ def test_ap_vht160_no_ht40(dev, apdev): raise HwsimSkip("80/160 MHz channel not supported in regulatory information") raise finally: - if hapd: - hapd.request("DISABLE") - subprocess.call(['iw', 'reg', 'set', '00']) - time.sleep(0.1) + clear_regdom(hapd, dev) def test_ap_vht80plus80(dev, apdev): """VHT with 80+80 MHz channel width"""