From: Masashi Honma <masashi.honma@gmail.com>
Date: Thu, 6 Jun 2019 05:27:40 +0000 (+0900)
Subject: tests: Fix ap_vht_use_sta_nsts false negative by using common finalizer
X-Git-Tag: hostap_2_9~131
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6749c67564776fe47ac092ce58cf68b995cd61a0;p=thirdparty%2Fhostap.git

tests: Fix ap_vht_use_sta_nsts false negative by using common finalizer

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

diff --git a/tests/hwsim/test_ap_vht.py b/tests/hwsim/test_ap_vht.py
index 709ef2c24..5f82a256b 100644
--- a/tests/hwsim/test_ap_vht.py
+++ b/tests/hwsim/test_ap_vht.py
@@ -1051,11 +1051,7 @@ def test_ap_vht_use_sta_nsts(dev, apdev):
                 raise HwsimSkip("80 MHz channel not supported in regulatory information")
         raise
     finally:
-        dev[0].request("DISCONNECT")
-        if hapd:
-            hapd.request("DISABLE")
-        subprocess.call(['iw', 'reg', 'set', '00'])
-        dev[0].flush_scan_cache()
+        clear_regdom(hapd, dev)
 
 def test_ap_vht_tkip(dev, apdev):
     """VHT and TKIP"""