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

tests: Use ctrl_iface event for EAP reauth instead of STATUS poll

Browse source 
This speeds up the EAP test cases a bit by avoiding polling for
wpa_supplicant status.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-01-05 09:23:46 +02:00
parent 710f96fd8c
commit bce774ad63
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/hwsim/test_ap_eap.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
# #
# WPA2-Enterprise tests # WPA2-Enterprise tests
# Copyright (c) 2013, Jouni Malinen <j@w1.fi> # Copyright (c) 2013-2014, Jouni Malinen <j@w1.fi>
# #
# This software may be distributed under the terms of the BSD license. # This software may be distributed under the terms of the BSD license.
# See README for more details. # See README for more details.
@ -46,20 +46,13 @@ def eap_check_auth(dev, method, initial, rsn=True, sha256=False):
if initial: if initial:
ev = dev.wait_event(["CTRL-EVENT-CONNECTED"], timeout=10) ev = dev.wait_event(["CTRL-EVENT-CONNECTED"], timeout=10)
else:
ev = dev.wait_event(["WPA: Key negotiation completed"], timeout=10)
if ev is None: if ev is None:
raise Exception("Association with the AP timed out") raise Exception("Association with the AP timed out")
status = dev.get_status() status = dev.get_status()
if status["wpa_state"] != "COMPLETED": if status["wpa_state"] != "COMPLETED":
raise Exception("Connection not completed") raise Exception("Connection not completed")
else:
# no connected event since already connected
for i in range(0, 30):
status = dev.get_status()
if status["wpa_state"] == "COMPLETED":
break
time.sleep(0.1)
if status["wpa_state"] != "COMPLETED":
raise Exception("Connection not completed")
if status["suppPortStatus"] != "Authorized": if status["suppPortStatus"] != "Authorized":
raise Exception("Port not authorized") raise Exception("Port not authorized")