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

tests: Fix ap_vht80_invalid false negative by using common finalizer

ap_vht80_invalid 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_vht.py b/tests/hwsim/test_ap_vht.py
index c73112312..da798ede7 100644
--- a/tests/hwsim/test_ap_vht.py
+++ b/tests/hwsim/test_ap_vht.py
@@ -239,10 +239,7 @@ def test_ap_vht80_invalid(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_vht80_invalid2(dev, apdev):
     """VHT with invalid 80 MHz channel configuration (seg0)"""