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

tests: Fix ap_vht_40 false negative by using common finalizer

ap_vht_40 fails with this message.

---------------
wlan0: Country code not reset back to 00: is DE
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 6af7ec64c..7b5a78dad 100644
--- a/tests/hwsim/test_ap_vht.py
+++ b/tests/hwsim/test_ap_vht.py
@@ -315,10 +315,7 @@ def test_ap_vht_40(devs, apdevs):
         hwsim_utils.test_connectivity(dev, hapd)
     finally:
         dev.request("DISCONNECT")
-        if hapd:
-            hapd.request("DISABLE")
-        subprocess.call(['iw', 'reg', 'set', '00'])
-        dev.flush_scan_cache()
+        clear_regdom(hapd, devs)
 
 def test_ap_vht_capab_not_supported(dev, apdev):
     """VHT configuration with driver not supporting all vht_capab entries"""