tests: Use a single channel scan to avoid unnecessary full scans

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/tests/hwsim/test_ap_hs20.py b/tests/hwsim/test_ap_hs20.py
index 06985d8c35e45eeed39213be7701bb9416ea2e9e..a83cee69b728b8011ebedcddc94ba65ac0415517 100644 (file)
--- a/tests/hwsim/test_ap_hs20.py
+++ b/tests/hwsim/test_ap_hs20.py
@@ -160,7 +160,7 @@ def test_ap_interworking_scan_filtering(dev, apdev):
     logger.info("Check probe request filtering based on HESSID")
 
     dev[0].request("SET hessid " + bssid2)
-    dev[0].scan()
+    dev[0].scan(freq="2412")
     check_probe_resp(wt, bssid, bssid2)
 
     logger.info("Check probe request filtering based on access network type")
@@ -169,14 +169,14 @@ def test_ap_interworking_scan_filtering(dev, apdev):
     wt.clear_bss_counters(bssid2)
     dev[0].request("SET hessid 00:00:00:00:00:00")
     dev[0].request("SET access_network_type 14")
-    dev[0].scan()
+    dev[0].scan(freq="2412")
     check_probe_resp(wt, bssid2, bssid)
 
     wt.clear_bss_counters(bssid)
     wt.clear_bss_counters(bssid2)
     dev[0].request("SET hessid 00:00:00:00:00:00")
     dev[0].request("SET access_network_type 1")
-    dev[0].scan()
+    dev[0].scan(freq="2412")
     check_probe_resp(wt, bssid, bssid2)
 
     logger.info("Check probe request filtering based on HESSID and ANT")
@@ -185,14 +185,14 @@ def test_ap_interworking_scan_filtering(dev, apdev):
     wt.clear_bss_counters(bssid2)
     dev[0].request("SET hessid " + bssid)
     dev[0].request("SET access_network_type 14")
-    dev[0].scan()
+    dev[0].scan(freq="2412")
     check_probe_resp(wt, bssid2, bssid)
 
     wt.clear_bss_counters(bssid)
     wt.clear_bss_counters(bssid2)
     dev[0].request("SET hessid " + bssid2)
     dev[0].request("SET access_network_type 14")
-    dev[0].scan()
+    dev[0].scan(freq="2412")
     check_probe_resp(wt, bssid, None)
     check_probe_resp(wt, bssid2, None)
 
@@ -200,7 +200,7 @@ def test_ap_interworking_scan_filtering(dev, apdev):
     wt.clear_bss_counters(bssid2)
     dev[0].request("SET hessid " + bssid)
     dev[0].request("SET access_network_type 1")
-    dev[0].scan()
+    dev[0].scan(freq="2412")
     check_probe_resp(wt, bssid, None)
     check_probe_resp(wt, bssid2, None)
 

diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py
index af91277866766c4f35379d8319adad8945dc1a64..04ea5860246a0fa23984867de51cc4d2c1fff818 100644 (file)
--- a/tests/hwsim/wpasupplicant.py
+++ b/tests/hwsim/wpasupplicant.py
@@ -582,11 +582,13 @@ class WpaSupplicant:
             self.select_network(id)
         return id
 
-    def scan(self, type=None):
+    def scan(self, type=None, freq=None):
         if type:
             cmd = "SCAN TYPE=" + type
         else:
             cmd = "SCAN"
+        if freq:
+            cmd = cmd + " freq=" + freq
         self.dump_monitor()
         if not "OK" in self.request(cmd):
             raise Exception("Failed to trigger scan")