From 7e3f110b083762c0a2bd33507bb836bac71bd5c1 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sat, 31 Aug 2013 10:45:03 +0300 Subject: [PATCH] tests: Increase WPS timeout to 30 seconds Number of crypto operations seem to take very long time in the valgrind tests (about five seconds for public key generation for M1 and M2 on a virtual server) and this is enough to push the test runs to hit the timeout frequently even when there is no real error. Make this less frequent by increasing WPS test case timeout from 15 to 30 seconds to avoid issues based on the test scripts. Signed-hostap: Jouni Malinen --- tests/hwsim/test_ap_wps.py | 4 ++-- tests/hwsim/test_nfc_wps.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/hwsim/test_ap_wps.py b/tests/hwsim/test_ap_wps.py index 9b41d1247..0707bae0b 100644 --- a/tests/hwsim/test_ap_wps.py +++ b/tests/hwsim/test_ap_wps.py @@ -50,7 +50,7 @@ def test_ap_wps_conf(dev, apdev): hapd.request("WPS_PBC") dev[0].dump_monitor() dev[0].request("WPS_PBC") - ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=15) + ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=30) if ev is None: raise Exception("Association with the AP timed out") status = dev[0].get_status() @@ -79,7 +79,7 @@ def test_ap_wps_conf_pin(dev, apdev): dev[0].request("SET ignore_old_scan_res 1") dev[0].dump_monitor() dev[0].request("WPS_PIN any " + pin) - ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=15) + ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=30) if ev is None: raise Exception("Association with the AP timed out") status = dev[0].get_status() diff --git a/tests/hwsim/test_nfc_wps.py b/tests/hwsim/test_nfc_wps.py index 9d5b2a48b..275212b24 100644 --- a/tests/hwsim/test_nfc_wps.py +++ b/tests/hwsim/test_nfc_wps.py @@ -53,7 +53,7 @@ def test_nfc_wps_password_token_sta(dev, apdev): res = dev[0].request("WPS_NFC") if "FAIL" in res: raise Exception("Failed to start Enrollee using NFC password token") - ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=15) + ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=30) if ev is None: raise Exception("Association with the AP timed out") check_wpa2_connection(dev[0], apdev[0], ssid) @@ -115,7 +115,7 @@ def test_nfc_wps_password_token_sta_init(dev, apdev): res = dev[0].request("WPS_NFC") if "FAIL" in res: raise Exception("Failed to start Enrollee using NFC password token") - ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=15) + ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=30) if ev is None: raise Exception("Association with the AP timed out") check_wpa2_connection(dev[0], apdev[0], ssid, mixed=True) @@ -143,7 +143,7 @@ def test_nfc_wps_password_token_ap(dev, apdev): res = dev[0].request("WPS_REG " + apdev[0]['bssid'] + " nfc-pw " + new_ssid.encode("hex") + " WPA2PSK CCMP " + new_passphrase.encode("hex")) if "FAIL" in res: raise Exception("Failed to start Registrar using NFC password token") - ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=15) + ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=30) if ev is None: raise Exception("Association with the AP timed out") check_wpa2_connection(dev[0], apdev[0], new_ssid, mixed=True) @@ -168,7 +168,7 @@ def test_nfc_wps_handover(dev, apdev): res = dev[0].request("NFC_REPORT_HANDOVER INIT WPS " + req + " " + sel) if "FAIL" in res: raise Exception("Failed to report NFC connection handover to to wpa_supplicant") - ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=15) + ev = dev[0].wait_event(["CTRL-EVENT-CONNECTED"], timeout=30) if ev is None: raise Exception("Association with the AP timed out") check_wpa2_connection(dev[0], apdev[0], ssid)