tests: Fix ap_vht_tkip false negative by using common finalizer

ap_vht_tkip 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 a5a13fdfc8821456f1f1228d6e1294ea4520cfcf..02b068f47309d6f91616b3958618717f5c8b52b6 100644 (file)
--- a/tests/hwsim/test_ap_vht.py
+++ b/tests/hwsim/test_ap_vht.py
@@ -1067,10 +1067,7 @@ def test_ap_vht_tkip(dev, apdev):
         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_40_fallback_to_20(devs, apdevs):
     """VHT and 40 MHz channel configuration falling back to 20 MHz"""