From b3c8e02966b50d0e87b224940daa68caccaf46e7 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Tue, 25 Jun 2019 10:50:45 +0900 Subject: [PATCH] tests: Fix ap_ht40_5ghz_invalid_pair false negative by using common finalizer ap_ht40_5ghz_invalid_pair fails with this message. --------------- wlan0: Country code not reset back to 00: is US wlan0: Country code cleared back to 00 --------------- This patch fixes the issue. Signed-off-by: Masashi Honma --- tests/hwsim/test_ap_ht.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/hwsim/test_ap_ht.py b/tests/hwsim/test_ap_ht.py index 9c6f1e447..2ee1af849 100644 --- a/tests/hwsim/test_ap_ht.py +++ b/tests/hwsim/test_ap_ht.py @@ -12,7 +12,7 @@ import struct import hostapd from wpasupplicant import WpaSupplicant -from utils import HwsimSkip, alloc_fail, parse_ie +from utils import HwsimSkip, alloc_fail, parse_ie, clear_regdom import hwsim_utils from test_ap_csa import csa_supported @@ -1267,7 +1267,7 @@ def test_ap_ht40_5ghz_invalid_pair(dev, apdev): if sec != "0": raise Exception("Invalid 40 MHz channel accepted") finally: - set_world_reg(apdev[0], None, None) + clear_regdom(hapd, dev) @remote_compatible def test_ap_ht40_5ghz_disabled_sec(dev, apdev):