jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Allow multiple Enrollee events in ap_wps_er_add_enrollee_pbc

Browse source 
It was possible for the AP to report two enrollees in this test case
(i.e., both the expected wlan1 device and also the ER device on wlan0).
The previous test script would fail if the wlan0 device is reported
first. Fix this by allowed the expected target to be found in either the
first or the second WPS-ER-ENROLLEE-ADD event.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-01-05 16:49:31 +02:00
parent d4b21766e5
commit 8674c02244
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/hwsim/test_ap_wps.py
View file

@ -1,7 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
# #
# WPS tests # WPS 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.
@ -705,11 +705,14 @@ def test_ap_wps_er_add_enrollee_pbc(dev, apdev):
dev[1].dump_monitor() dev[1].dump_monitor()
dev[1].request("WPS_PBC") dev[1].request("WPS_PBC")
ev = dev[0].wait_event(["WPS-ER-ENROLLEE-ADD"], timeout=15) for i in range(0, 2):
if ev is None: ev = dev[0].wait_event(["WPS-ER-ENROLLEE-ADD"], timeout=15)
raise Exception("Enrollee discovery timed out") if ev is None:
if enrollee not in ev: raise Exception("Enrollee discovery timed out")
raise Exception("Expected Enrollee not found") if enrollee in ev:
break
if i == 1:
raise Exception("Expected Enrollee not found")
dev[0].request("WPS_ER_PBC " + enrollee) dev[0].request("WPS_ER_PBC " + enrollee)
ev = dev[1].wait_event(["WPS-SUCCESS"], timeout=15) ev = dev[1].wait_event(["WPS-SUCCESS"], timeout=15)