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

tests: Verify that roaming attempts do not get rejected

Browse source 
The previous roam() and roam_over_ds() checks would have ignored failing
association rejection if a consecutive attempt to connect succeeds
within the initial time limit. This can miss incorrect behavior, so
check explicitly for association rejection.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-01-04 20:27:40 +02:00
parent de027ef595
commit 04e17e5024
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/hwsim/wpasupplicant.py
View file

@ -1,5 +1,5 @@
# Python class for controlling wpa_supplicant # Python class for controlling wpa_supplicant
# Copyright (c) 2013-2014, Jouni Malinen <j@w1.fi> # Copyright (c) 2013-2019, 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.
@ -1116,7 +1116,12 @@ class WpaSupplicant:
raise Exception("Unexpected connection") raise Exception("Unexpected connection")
self.dump_monitor() self.dump_monitor()
return return
self.wait_connected(timeout=10, error="Roaming with the AP timed out") ev = self.wait_event(["CTRL-EVENT-CONNECTED",
"CTRL-EVENT-ASSOC-REJECT"], timeout=10)
if ev is None:
raise Exception("Roaming with the AP timed out")
if "CTRL-EVENT-ASSOC-REJECT" in ev:
raise Exception("Roaming association rejected")
self.dump_monitor() self.dump_monitor()
def roam_over_ds(self, bssid, fail_test=False): def roam_over_ds(self, bssid, fail_test=False):
@ -1129,7 +1134,12 @@ class WpaSupplicant:
raise Exception("Unexpected connection") raise Exception("Unexpected connection")
self.dump_monitor() self.dump_monitor()
return return
self.wait_connected(timeout=10, error="Roaming with the AP timed out") ev = self.wait_event(["CTRL-EVENT-CONNECTED",
"CTRL-EVENT-ASSOC-REJECT"], timeout=10)
if ev is None:
raise Exception("Roaming with the AP timed out")
if "CTRL-EVENT-ASSOC-REJECT" in ev:
raise Exception("Roaming association rejected")
self.dump_monitor() self.dump_monitor()
def wps_reg(self, bssid, pin, new_ssid=None, key_mgmt=None, cipher=None, def wps_reg(self, bssid, pin, new_ssid=None, key_mgmt=None, cipher=None,