tests: Move hessid and access_network_type reset to test case

This removes unnecessary reset() steps from between every test case.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/tests/hwsim/test_ap_hs20.py b/tests/hwsim/test_ap_hs20.py
index 5e02f160dd149c6f0d2c0c16d9415d8e3c33a6ee..7a44be3306557a1224f487ef208f0c9503f1c12d 100644 (file)
--- a/tests/hwsim/test_ap_hs20.py
+++ b/tests/hwsim/test_ap_hs20.py
@@ -241,6 +241,13 @@ def test_ap_nai_home_realm_query(dev, apdev):
 
 def test_ap_interworking_scan_filtering(dev, apdev):
     """Interworking scan filtering with HESSID and access network type"""
+    try:
+        return _test_ap_interworking_scan_filtering(dev, apdev)
+    finally:
+        dev[0].request("SET hessid 00:00:00:00:00:00")
+        dev[0].request("SET access_network_type 15")
+
+def _test_ap_interworking_scan_filtering(dev, apdev):
     bssid = apdev[0]['bssid']
     params = hs20_ap_params()
     ssid = "test-hs20-ap1"

diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py
index 1ef5ea47042e091c29607616d124e733bff03f06..5a782c942735c80997326dad1db2d2a698a4eafc 100644 (file)
--- a/tests/hwsim/wpasupplicant.py
+++ b/tests/hwsim/wpasupplicant.py
@@ -93,8 +93,6 @@ class WpaSupplicant:
             logger.info("FLUSH to " + self.ifname + " failed: " + res)
         self.request("WPS_ER_STOP")
         self.request("SET pmf 0")
-        self.request("SET hessid 00:00:00:00:00:00")
-        self.request("SET access_network_type 15")
         self.request("SET p2p_add_cli_chan 0")
         self.request("SET p2p_no_go_freq ")
         self.request("SET p2p_pref_chan ")