tests: Fix ap_vht_20 false negative by using common finalizer

ap_vht_20 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 1ebde4aa06673009d56a3e16aa042a19d8f42f3d..6af7ec64c59fb044d7e3bb3aea59aa3fe22a8437 100644 (file)
--- a/tests/hwsim/test_ap_vht.py
+++ b/tests/hwsim/test_ap_vht.py
@@ -292,10 +292,7 @@ def test_ap_vht_20(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_40(devs, apdevs):
     """VHT and 40 MHz channel"""