tests: Extend the timeout for some SAE error case tests

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>

diff --git a/tests/hwsim/test_sae.py b/tests/hwsim/test_sae.py
index 7e9120c35509750a73478867160e84371249ef7a..da90608d6bc51013a168408b5be4d550ee3b3fc5 100644 (file)
--- a/tests/hwsim/test_sae.py
+++ b/tests/hwsim/test_sae.py
@@ -1396,7 +1396,7 @@ def test_sae_bignum_failure(dev, apdev):
             hapd.request("NOTE STA failure testing %d:%s" % (count, func))
             dev[0].connect("test-sae", psk="12345678", key_mgmt="SAE",
                            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].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))
             dev[0].connect("test-sae", psk="12345678", key_mgmt="SAE",
                            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].dump_monitor()
             hapd.dump_monitor()

diff --git a/tests/hwsim/utils.py b/tests/hwsim/utils.py
index 26620a6ca8545e49cfdcc2530494fd385aab239c..b3a8831317db6a1947ae92a0fc988da7397efbb9 100644 (file)
--- a/tests/hwsim/utils.py
+++ b/tests/hwsim/utils.py
@@ -58,13 +58,14 @@ class fail_test(object):
             if self._dev.request("GET_FAIL") != "0:%s" % self._funcs:
                 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):
         if dev.request(cmd).startswith("0:"):
             break
         if i == max_iter - 1:
             raise Exception(note)
-        time.sleep(0.05)
+        time.sleep(timeout)
 
 def require_under_vm():
     with open('/proc/1/cmdline', 'r') as f: