tests: Fix ap_vht_40_fallback_to_20 false negative by using common finalizer

ap_vht_40_fallback_to_20 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 02b068f47309d6f91616b3958618717f5c8b52b6..53f6d2c7bc6d26f2777e9ca3280e93b7170f9e4e 100644 (file)
--- a/tests/hwsim/test_ap_vht.py
+++ b/tests/hwsim/test_ap_vht.py
@@ -1093,12 +1093,7 @@ def test_ap_vht_40_fallback_to_20(devs, apdevs):
         dev.wait_regdom(country_ie=True)
         hwsim_utils.test_connectivity(dev, hapd)
     finally:
-        if hapd:
-            hapd.request("DISABLE")
-        dev.disconnect_and_stop_scan()
-        subprocess.call(['iw', 'reg', 'set', '00'])
-        dev.wait_event(["CTRL-EVENT-REGDOM-CHANGE"], timeout=0.5)
-        dev.flush_scan_cache()
+        clear_regdom(hapd, devs)
 
 def test_ap_vht80_to_24g_ht(dev, apdev):
     """VHT with 80 MHz channel width reconfigured to 2.4 GHz HT"""