jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Wait for AP side connection event before disconnecting

Browse source 
This makes the test cases more robust especially when testing with UML
time travel.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2019-08-05 13:47:08 +03:00 committed by Jouni Malinen
parent 422e73d623
commit f13de00b89
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tests/hwsim/test_suite_b.py
View file

@ -68,6 +68,7 @@ def test_suite_b(dev, apdev):
client_cert="auth_serv/ec-user.pem", client_cert="auth_serv/ec-user.pem",
private_key="auth_serv/ec-user.key", private_key="auth_serv/ec-user.key",
pairwise="GCMP", group="GCMP", scan_freq="2412") pairwise="GCMP", group="GCMP", scan_freq="2412")
hapd.wait_sta()
tls_cipher = dev[0].get_status_field("EAP TLS cipher") tls_cipher = dev[0].get_status_field("EAP TLS cipher")
if tls_cipher != "ECDHE-ECDSA-AES128-GCM-SHA256" and \ if tls_cipher != "ECDHE-ECDSA-AES128-GCM-SHA256" and \
tls_cipher != "ECDHE-ECDSA-AES-128-GCM-AEAD": tls_cipher != "ECDHE-ECDSA-AES-128-GCM-AEAD":
@ -94,6 +95,7 @@ def test_suite_b(dev, apdev):
if conf['key_mgmt'] != 'WPA-EAP-SUITE-B': if conf['key_mgmt'] != 'WPA-EAP-SUITE-B':
raise Exception("Unexpected config key_mgmt: " + conf['key_mgmt']) raise Exception("Unexpected config key_mgmt: " + conf['key_mgmt'])
hapd.wait_sta()
dev[0].request("DISCONNECT") dev[0].request("DISCONNECT")
dev[0].wait_disconnected(timeout=20) dev[0].wait_disconnected(timeout=20)
dev[0].dump_monitor() dev[0].dump_monitor()
@ -201,6 +203,7 @@ def test_suite_b_192(dev, apdev):
if "[WPA2-EAP-SUITE-B-192-GCMP-256]" not in bss['flags']: if "[WPA2-EAP-SUITE-B-192-GCMP-256]" not in bss['flags']:
raise Exception("Unexpected BSS flags: " + bss['flags']) raise Exception("Unexpected BSS flags: " + bss['flags'])
hapd.wait_sta()
dev[0].request("DISCONNECT") dev[0].request("DISCONNECT")
dev[0].wait_disconnected(timeout=20) dev[0].wait_disconnected(timeout=20)
dev[0].dump_monitor() dev[0].dump_monitor()
@ -216,6 +219,7 @@ def test_suite_b_192(dev, apdev):
if conf['key_mgmt'] != 'WPA-EAP-SUITE-B-192': if conf['key_mgmt'] != 'WPA-EAP-SUITE-B-192':
raise Exception("Unexpected config key_mgmt: " + conf['key_mgmt']) raise Exception("Unexpected config key_mgmt: " + conf['key_mgmt'])
hapd.wait_sta()
dev[0].request("DISCONNECT") dev[0].request("DISCONNECT")
dev[0].wait_disconnected(timeout=20) dev[0].wait_disconnected(timeout=20)
dev[0].dump_monitor() dev[0].dump_monitor()
@ -437,6 +441,7 @@ def run_suite_b_192_rsa(dev, apdev, no_ecdh=False, no_dhe=False):
if "[WPA2-EAP-SUITE-B-192-GCMP-256]" not in bss['flags']: if "[WPA2-EAP-SUITE-B-192-GCMP-256]" not in bss['flags']:
raise Exception("Unexpected BSS flags: " + bss['flags']) raise Exception("Unexpected BSS flags: " + bss['flags'])
hapd.wait_sta()
dev[0].request("DISCONNECT") dev[0].request("DISCONNECT")
dev[0].wait_disconnected(timeout=20) dev[0].wait_disconnected(timeout=20)
dev[0].dump_monitor() dev[0].dump_monitor()