From: Masashi Honma <masashi.honma@gmail.com>
Date: Tue, 25 Jun 2019 01:50:46 +0000 (+0900)
Subject: tests: Fix ap_ht40_5ghz_disabled_sec false negative by using common finalizer
X-Git-Tag: hostap_2_9~120
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e450fbdbedd255aab550b561930320316119f1f;p=thirdparty%2Fhostap.git

tests: Fix ap_ht40_5ghz_disabled_sec false negative by using common finalizer

ap_ht40_5ghz_disabled_sec 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 <masashi.honma@gmail.com>
---

diff --git a/tests/hwsim/test_ap_ht.py b/tests/hwsim/test_ap_ht.py
index 2ee1af849..b1e2a10d6 100644
--- a/tests/hwsim/test_ap_ht.py
+++ b/tests/hwsim/test_ap_ht.py
@@ -1288,7 +1288,7 @@ def test_ap_ht40_5ghz_disabled_sec(dev, apdev):
             if sec != "0":
                 raise Exception("Invalid 40 MHz channel accepted")
     finally:
-        set_world_reg(apdev[0], None, None)
+        clear_regdom(hapd, dev)
 
 def test_ap_ht40_scan_broken_ap(dev, apdev):
     """HT40 co-ex scan and broken legacy/HT AP"""