From 73dbcd7951875ab2ac4dc0ee909e3250dd735128 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 28 May 2019 17:14:33 +0300 Subject: [PATCH] tests: Make pmksa_cache_preauth_auto more robust It is fine for the station to associate with either AP in this test case, so do not force AP side connection check with apdev[0]. Signed-off-by: Jouni Malinen --- tests/hwsim/test_ap_eap.py | 7 ++++--- tests/hwsim/test_pmksa_cache.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/hwsim/test_ap_eap.py b/tests/hwsim/test_ap_eap.py index 6e7741bc1..06eee3f95 100644 --- a/tests/hwsim/test_ap_eap.py +++ b/tests/hwsim/test_ap_eap.py @@ -149,9 +149,10 @@ def eap_connect(dev, hapd, method, identity, expect_cert_error=expect_cert_error) if expect_failure: return id - ev = hapd.wait_event(["AP-STA-CONNECTED"], timeout=5) - if ev is None: - raise Exception("No connection event received from hostapd") + if hapd: + ev = hapd.wait_event(["AP-STA-CONNECTED"], timeout=5) + if ev is None: + raise Exception("No connection event received from hostapd") return id def eap_check_auth(dev, method, initial, rsn=True, sha256=False, diff --git a/tests/hwsim/test_pmksa_cache.py b/tests/hwsim/test_pmksa_cache.py index a2c0e1975..1d0a708fa 100644 --- a/tests/hwsim/test_pmksa_cache.py +++ b/tests/hwsim/test_pmksa_cache.py @@ -455,7 +455,7 @@ def run_pmksa_cache_preauth_auto(dev, apdev): hapd.cmd_execute(['ip', 'link', 'set', 'dev', 'ap-br0', 'up']) hapd2 = hostapd.add_ap(apdev[1], params) - eap_connect(dev[0], hapd, "PAX", "pax.user@example.com", + eap_connect(dev[0], None, "PAX", "pax.user@example.com", password_hex="0123456789abcdef0123456789abcdef") found = False