tests: Fix ap_track_sta_force_5ghz false negative by using common finalizer

ap_track_sta_force_5ghz 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_track.py b/tests/hwsim/test_ap_track.py
index 0a325afa2dc90932281a70b099fa5aa018a94b2c..c11f45e7ccc5135491342fa8281713f8bf0d0747 100644 (file)
--- a/tests/hwsim/test_ap_track.py
+++ b/tests/hwsim/test_ap_track.py
@@ -231,29 +231,28 @@ def _test_ap_track_sta_no_auth_passive(dev, bssid, bssid2):
 def test_ap_track_sta_force_5ghz(dev, apdev):
     """Dualband AP forcing dualband STA to connect on 5 GHz"""
     try:
-        _test_ap_track_sta_force_5ghz(dev, apdev)
-    finally:
-        subprocess.call(['iw', 'reg', 'set', '00'])
-        time.sleep(0.1)
+        params = {"ssid": "track",
+                  "country_code": "US",
+                  "hw_mode": "g",
+                  "channel": "6",
+                  "no_probe_resp_if_seen_on": apdev[1]['ifname'],
+                  "no_auth_if_seen_on": apdev[1]['ifname']}
+        hapd = hostapd.add_ap(apdev[0], params)
 
-def _test_ap_track_sta_force_5ghz(dev, apdev):
-    params = {"ssid": "track",
-              "country_code": "US",
-              "hw_mode": "g",
-              "channel": "6",
-              "no_probe_resp_if_seen_on": apdev[1]['ifname'],
-              "no_auth_if_seen_on": apdev[1]['ifname']}
-    hapd = hostapd.add_ap(apdev[0], params)
-    bssid = apdev[0]['bssid']
+        params = {"ssid": "track",
+                  "country_code": "US",
+                  "hw_mode": "a",
+                  "channel": "40",
+                  "track_sta_max_num": "100"}
+        hapd2 = hostapd.add_ap(apdev[1], params)
 
-    params = {"ssid": "track",
-              "country_code": "US",
-              "hw_mode": "a",
-              "channel": "40",
-              "track_sta_max_num": "100"}
-    hapd2 = hostapd.add_ap(apdev[1], params)
-    bssid2 = apdev[1]['bssid']
+        _test_ap_track_sta_force_5ghz(dev, apdev[0]['bssid'], apdev[1]['bssid'])
+    finally:
+        disable_hapd(hapd)
+        disable_hapd(hapd2)
+        clear_regdom_dev(dev)
 
+def _test_ap_track_sta_force_5ghz(dev, bssid, bssid2):
     dev[0].scan_for_bss(bssid, freq=2437, force_scan=True)
     dev[0].scan_for_bss(bssid2, freq=5200, force_scan=True)