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

tests: Extend the timeout for some SAE error case tests

Browse source 
Commit 407879b690ba ("mac80211: Adjust SAE authentication timeout") in
the kernel tree increased the SAE authentication timeout. This caused
some error case tests to fail. To fix this, extend the timeout for some
error case tests.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
This commit is contained in:
Ilan Peer 2018-08-22 19:49:05 +03:00 committed by Jouni Malinen
parent 02c21c02d0
commit 7bcb63913a
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/hwsim/test_sae.py
View file

@ -1396,7 +1396,7 @@ def test_sae_bignum_failure(dev, apdev):
hapd.request("NOTE STA failure testing %d:%s" % (count, func)) hapd.request("NOTE STA failure testing %d:%s" % (count, func))
dev[0].connect("test-sae", psk="12345678", key_mgmt="SAE", dev[0].connect("test-sae", psk="12345678", key_mgmt="SAE",
scan_freq="2412", wait_connect=False) scan_freq="2412", wait_connect=False)
wait_fail_trigger(dev[0], "GET_FAIL") wait_fail_trigger(dev[0], "GET_FAIL", timeout=0.1)
dev[0].request("REMOVE_NETWORK all") dev[0].request("REMOVE_NETWORK all")
dev[0].dump_monitor() dev[0].dump_monitor()
hapd.dump_monitor() hapd.dump_monitor()
@ -1426,7 +1426,7 @@ def test_sae_bignum_failure(dev, apdev):
hapd.request("NOTE STA failure testing %d:%s" % (count, func)) hapd.request("NOTE STA failure testing %d:%s" % (count, func))
dev[0].connect("test-sae", psk="12345678", key_mgmt="SAE", dev[0].connect("test-sae", psk="12345678", key_mgmt="SAE",
scan_freq="2412", wait_connect=False) scan_freq="2412", wait_connect=False)
wait_fail_trigger(dev[0], "GET_FAIL") wait_fail_trigger(dev[0], "GET_FAIL", timeout=0.1)
dev[0].request("REMOVE_NETWORK all") dev[0].request("REMOVE_NETWORK all")
dev[0].dump_monitor() dev[0].dump_monitor()
hapd.dump_monitor() hapd.dump_monitor()

5
tests/hwsim/utils.py
View file

@ -58,13 +58,14 @@ class fail_test(object):
if self._dev.request("GET_FAIL") != "0:%s" % self._funcs: if self._dev.request("GET_FAIL") != "0:%s" % self._funcs:
raise Exception("Test failure did not trigger") raise Exception("Test failure did not trigger")
def wait_fail_trigger(dev, cmd, note="Failure not triggered", max_iter=40): def wait_fail_trigger(dev, cmd, note="Failure not triggered", max_iter=40,
timeout=0.05):
for i in range(0, max_iter): for i in range(0, max_iter):
if dev.request(cmd).startswith("0:"): if dev.request(cmd).startswith("0:"):
break break
if i == max_iter - 1: if i == max_iter - 1:
raise Exception(note) raise Exception(note)
time.sleep(0.05) time.sleep(timeout)
def require_under_vm(): def require_under_vm():
with open('/proc/1/cmdline', 'r') as f: with open('/proc/1/cmdline', 'r') as f: