From: Ilan Peer <ilan.peer@intel.com>
Date: Wed, 22 Aug 2018 16:49:05 +0000 (+0300)
Subject: tests: Extend the timeout for some SAE error case tests
X-Git-Tag: hostap_2_10~2043
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bcb63913a95e339be62f907a5a1c2b0191fcd88;p=thirdparty%2Fhostap.git

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 7e9120c35..da90608d6 100644
--- 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 26620a6ca..b3a883131 100644
--- 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: