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

tests: Optimize multi_check() waits in ap_bss_add* and ap_multi_bss*

Browse source 
There is no need to wait for the longer fixed duration for each STA when
an event message or an earlier wait for another STA can be used instead.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-12-23 17:20:18 +02:00
parent 610cfff5d7
commit 4905f1ebfe
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/hwsim/test_ap_dynamic.py
View file

@ -40,18 +40,30 @@ def multi_check(dev, check):
for i in range(0, num_bss): for i in range(0, num_bss):
dev[i].request("BSS_FLUSH 0") dev[i].request("BSS_FLUSH 0")
dev[i].dump_monitor() dev[i].dump_monitor()
id.append(dev[i].connect("bss-" + str(i + 1), key_mgmt="NONE",
scan_freq="2412", wait_connect=check[i]))
for i in range(0, num_bss): for i in range(0, num_bss):
if check[i]:
continue
id.append(dev[i].connect("bss-" + str(i + 1), key_mgmt="NONE",
scan_freq="2412", wait_connect=False))
for i in range(num_bss):
if not check[i]: if not check[i]:
ev = dev[i].wait_event(["CTRL-EVENT-CONNECTED"], timeout=0.2) continue
id.append(dev[i].connect("bss-" + str(i + 1), key_mgmt="NONE",
scan_freq="2412", wait_connect=True))
first = True
for i in range(num_bss):
if not check[i]:
timeout=0.2 if first else 0.01
first = False
ev = dev[i].wait_event(["CTRL-EVENT-CONNECTED"], timeout=timeout)
if ev: if ev:
raise Exception("Unexpected connection") raise Exception("Unexpected connection")
for i in range(0, num_bss): for i in range(0, num_bss):
dev[i].remove_network(id[i]) dev[i].remove_network(id[i])
for i in range(num_bss):
time.sleep(0.3) if check[i]:
dev[i].wait_disconnected(timeout=5)
res = '' res = ''
for i in range(0, num_bss): for i in range(0, num_bss):