DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Make wext_pmksa_cache work with S1G channels

Browse source 
If mac80211_hwsim has S1G channels enabled, the 15 second timeout was
not sufficiently long for full scan while connected.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2023-01-16 12:39:38 +02:00 committed by Jouni Malinen
parent 19d3e0383f
commit 415458e2b3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/hwsim/test_wext.py
View file

@ -108,7 +108,7 @@ def test_wext_pmksa_cache(dev, apdev):
# of scanning to avoid reporting errors incorrectly just because of scans # of scanning to avoid reporting errors incorrectly just because of scans
# not having seen the target AP. # not having seen the target AP.
for i in range(3): for i in range(3):
wpas.scan() wpas.scan(timeout=30)
if wpas.get_bss(bssid2) is not None: if wpas.get_bss(bssid2) is not None:
break break
logger.info("Scan again to find target AP") logger.info("Scan again to find target AP")
@ -125,7 +125,7 @@ def test_wext_pmksa_cache(dev, apdev):
wpas.dump_monitor() wpas.dump_monitor()
logger.info("Roam back to AP1") logger.info("Roam back to AP1")
wpas.scan() wpas.scan(timeout=30)
wpas.request("ROAM " + bssid) wpas.request("ROAM " + bssid)
ev = wpas.wait_event(["CTRL-EVENT-EAP-STARTED", ev = wpas.wait_event(["CTRL-EVENT-EAP-STARTED",
"CTRL-EVENT-CONNECTED"], timeout=15) "CTRL-EVENT-CONNECTED"], timeout=15)

4
tests/hwsim/wpasupplicant.py
View file

@ -1155,7 +1155,7 @@ class WpaSupplicant:
return id return id
def scan(self, type=None, freq=None, no_wait=False, only_new=False, def scan(self, type=None, freq=None, no_wait=False, only_new=False,
passive=False): passive=False, timeout=15):
if not no_wait: if not no_wait:
self.dump_monitor() self.dump_monitor()
if type: if type:
@ -1176,7 +1176,7 @@ class WpaSupplicant:
if no_wait: if no_wait:
return return
ev = self.wait_event(["CTRL-EVENT-SCAN-RESULTS", ev = self.wait_event(["CTRL-EVENT-SCAN-RESULTS",
"CTRL-EVENT-SCAN-FAILED"], 15) "CTRL-EVENT-SCAN-FAILED"], timeout)
if ev is None: if ev is None:
raise Exception("Scan timed out") raise Exception("Scan timed out")
if "CTRL-EVENT-SCAN-FAILED" in ev: if "CTRL-EVENT-SCAN-FAILED" in ev: