Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-25 00:38:24 -05:00
Code Issues Projects Releases Wiki Activity

tests: Make DPP text cases more robust for DPP-TX event processing

Browse Source 
The previous waits were matching both DPP-TX and DPP-TX-STATUS and if
the latter event was received, the test cases would either report
failure or would not really test what was supposed to be verified. Fix
this by waiting explicitly for "DPP-TX " to avoid matching
"DPP-TX-STATUS" prefix.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-12-22 23:33:21 +02:00
parent bf97c1a34e
commit dbdd445d33
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/hwsim/test_dpp.py
View File

@ -439,7 +439,7 @@ def test_dpp_auth_resp_retries(dev, apdev):
logger.info("dev0 scans QR Code") logger.info("dev0 scans QR Code")
id0b = dev[0].dpp_qr_code(uri1b) id0b = dev[0].dpp_qr_code(uri1b)
ev = dev[0].wait_event(["DPP-TX"], timeout=5) ev = dev[0].wait_event(["DPP-TX "], timeout=5)
if ev is None or "type=1" not in ev: if ev is None or "type=1" not in ev:
raise Exception("DPP Authentication Response not sent") raise Exception("DPP Authentication Response not sent")
ev = dev[0].wait_event(["DPP-TX-STATUS"], timeout=5) ev = dev[0].wait_event(["DPP-TX-STATUS"], timeout=5)
@ -448,7 +448,7 @@ def test_dpp_auth_resp_retries(dev, apdev):
if "result=no-ACK" not in ev: if "result=no-ACK" not in ev:
raise Exception("Unexpected TX status for Authentication Response: " + ev) raise Exception("Unexpected TX status for Authentication Response: " + ev)
ev = dev[0].wait_event(["DPP-TX"], timeout=15) ev = dev[0].wait_event(["DPP-TX "], timeout=15)
if ev is None or "type=1" not in ev: if ev is None or "type=1" not in ev:
raise Exception("DPP Authentication Response retransmission not sent") raise Exception("DPP Authentication Response retransmission not sent")
@ -655,7 +655,7 @@ def test_dpp_qr_code_auth_neg_chan(dev, apdev):
dev[1].dpp_auth_init(uri=uri0, conf="sta-dpp", neg_freq=2462, dev[1].dpp_auth_init(uri=uri0, conf="sta-dpp", neg_freq=2462,
configurator=conf_id) configurator=conf_id)
ev = dev[1].wait_event(["DPP-TX"], timeout=5) ev = dev[1].wait_event(["DPP-TX "], timeout=5)
if ev is None: if ev is None:
raise Exception("DPP Authentication Request not sent") raise Exception("DPP Authentication Request not sent")
if "freq=2412 type=0" not in ev: if "freq=2412 type=0" not in ev:
@ -673,7 +673,7 @@ def test_dpp_qr_code_auth_neg_chan(dev, apdev):
if "freq=2412 result=SUCCESS" not in ev: if "freq=2412 result=SUCCESS" not in ev:
raise Exception("Unexpected TX status for Authentication Request: " + ev) raise Exception("Unexpected TX status for Authentication Request: " + ev)
ev = dev[0].wait_event(["DPP-TX"], timeout=5) ev = dev[0].wait_event(["DPP-TX "], timeout=5)
if ev is None: if ev is None:
raise Exception("DPP Authentication Response not sent") raise Exception("DPP Authentication Response not sent")
if "freq=2462 type=1" not in ev: if "freq=2462 type=1" not in ev:
@ -691,7 +691,7 @@ def test_dpp_qr_code_auth_neg_chan(dev, apdev):
if "freq=2462 result=SUCCESS" not in ev: if "freq=2462 result=SUCCESS" not in ev:
raise Exception("Unexpected TX status for Authentication Response: " + ev) raise Exception("Unexpected TX status for Authentication Response: " + ev)
ev = dev[1].wait_event(["DPP-TX"], timeout=5) ev = dev[1].wait_event(["DPP-TX "], timeout=5)
if ev is None: if ev is None:
raise Exception("DPP Authentication Confirm not sent") raise Exception("DPP Authentication Confirm not sent")
if "freq=2462 type=2" not in ev: if "freq=2462 type=2" not in ev:
@ -3323,7 +3323,7 @@ def test_dpp_proto_network_introduction(dev, apdev):
dpp_netaccesskey=params1_sta_netaccesskey, dpp_netaccesskey=params1_sta_netaccesskey,
wait_connect=False) wait_connect=False)
ev = dev[0].wait_event(["DPP-TX"], timeout=10) ev = dev[0].wait_event(["DPP-TX "], timeout=10)
if ev is None or "type=5" not in ev: if ev is None or "type=5" not in ev:
raise Exception("Peer Discovery Request TX not reported") raise Exception("Peer Discovery Request TX not reported")
ev = dev[0].wait_event(["DPP-TX-STATUS"], timeout=2) ev = dev[0].wait_event(["DPP-TX-STATUS"], timeout=2)