From 25a103cfe4796c08f2676880f9d22783828c113c Mon Sep 17 00:00:00 2001
From: Masashi Honma <masashi.honma@gmail.com>
Date: Tue, 25 Jun 2019 10:50:42 +0900
Subject: [PATCH] tests: Fix ap_track_sta_no_auth_passive false negative by
 using common finalizer

ap_track_sta_no_auth_passive 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>
---
 tests/hwsim/test_ap_track.py | 44 ++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/tests/hwsim/test_ap_track.py b/tests/hwsim/test_ap_track.py
index c909f6ff9..0a325afa2 100644
--- a/tests/hwsim/test_ap_track.py
+++ b/tests/hwsim/test_ap_track.py
@@ -173,32 +173,32 @@ def _test_ap_track_sta_no_auth(dev, bssid, bssid2):
 def test_ap_track_sta_no_auth_passive(dev, apdev):
     """AP rejecting authentication from dualband STA on 2.4 GHz (passive)"""
     try:
-        _test_ap_track_sta_no_auth_passive(dev, apdev)
+        params = {"ssid": "track",
+                  "country_code": "US",
+                  "hw_mode": "g",
+                  "channel": "6",
+                  "no_auth_if_seen_on": apdev[1]['ifname']}
+        hapd = hostapd.add_ap(apdev[0], params)
+
+        params = {"ssid": "track",
+                  "country_code": "US",
+                  "hw_mode": "a",
+                  "channel": "40",
+                  "interworking": "1",
+                  "venue_name": "eng:Venue",
+                  "track_sta_max_num": "100"}
+        hapd2 = hostapd.add_ap(apdev[1], params)
+
+        _test_ap_track_sta_no_auth_passive(dev, apdev[0]['bssid'],
+                                           apdev[1]['bssid'])
     finally:
-        subprocess.call(['iw', 'reg', 'set', '00'])
-        time.sleep(0.1)
+        disable_hapd(hapd)
+        disable_hapd(hapd2)
+        clear_regdom_dev(dev)
 
-def _test_ap_track_sta_no_auth_passive(dev, apdev):
+def _test_ap_track_sta_no_auth_passive(dev, bssid, bssid2):
     dev[0].flush_scan_cache()
 
-    params = {"ssid": "track",
-              "country_code": "US",
-              "hw_mode": "g",
-              "channel": "6",
-              "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",
-              "interworking": "1",
-              "venue_name": "eng:Venue",
-              "track_sta_max_num": "100"}
-    hapd2 = hostapd.add_ap(apdev[1], params)
-    bssid2 = apdev[1]['bssid']
-
     dev[0].scan_for_bss(bssid, freq=2437, force_scan=True)
     for i in range(10):
         dev[0].request("SCAN freq=5200 passive=1")