DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Add more time for concurrent GO group negotiation cases

Browse source 
It is possible for the parallel connection attempt with an AP and P2P
device discovery with P2P search on social channels to take close to the
15 second timeout and these test cases could fail because of that
instead of a real issue. Increase the timeout to make this less likely
to cause test failures. In addition, add a debug entry to the log on the
r_dev timeout to avoid confusing print from the i_dev thread reporting a
timeout even when the first timeout was on the rdev_

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2024-01-26 11:18:24 +02:00 committed by Jouni Malinen
parent e3fb9e6f2d
commit 2e7b51719b
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/hwsim/p2p_utils.py
View file

@ -351,6 +351,7 @@ def go_neg_pbc(i_dev, r_dev, i_intent=None, r_intent=None, i_freq=None,
logger.debug("Wait for GO Negotiation Request on r_dev") logger.debug("Wait for GO Negotiation Request on r_dev")
ev = r_dev.wait_global_event(["P2P-GO-NEG-REQUEST"], timeout=timeout - 5) ev = r_dev.wait_global_event(["P2P-GO-NEG-REQUEST"], timeout=timeout - 5)
if ev is None: if ev is None:
logger.debug("Wait for P2P-GO-NEG-REQUEST timed out on r_dev - wait for i_dev thread to complete")
t.join() t.join()
raise Exception("GO Negotiation timed out") raise Exception("GO Negotiation timed out")
r_dev.dump_monitor() r_dev.dump_monitor()

6
tests/hwsim/test_p2p_concurrency.py
View file

@ -221,7 +221,8 @@ def test_concurrent_grpform_while_connecting2(dev, apdev):
dev[0].global_request("SET p2p_no_group_iface 0") dev[0].global_request("SET p2p_no_group_iface 0")
[i_res, r_res] = go_neg_pbc(i_dev=dev[0], i_intent=15, i_freq=2412, [i_res, r_res] = go_neg_pbc(i_dev=dev[0], i_intent=15, i_freq=2412,
r_dev=dev[1], r_intent=0, r_freq=2412) r_dev=dev[1], r_intent=0, r_freq=2412,
timeout=30)
check_grpform_results(i_res, r_res) check_grpform_results(i_res, r_res)
remove_group(dev[0], dev[1]) remove_group(dev[0], dev[1])
@ -240,7 +241,8 @@ def test_concurrent_grpform_while_connecting3(dev, apdev):
dev[0].global_request("SET p2p_no_group_iface 0") dev[0].global_request("SET p2p_no_group_iface 0")
[i_res, r_res] = go_neg_pbc(i_dev=dev[1], i_intent=15, i_freq=2412, [i_res, r_res] = go_neg_pbc(i_dev=dev[1], i_intent=15, i_freq=2412,
r_dev=dev[0], r_intent=0, r_freq=2412) r_dev=dev[0], r_intent=0, r_freq=2412,
timeout=30)
check_grpform_results(i_res, r_res) check_grpform_results(i_res, r_res)
remove_group(dev[0], dev[1]) remove_group(dev[0], dev[1])