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

tests: Increase timeout in go_neg_forced_freq_diff_than_bss_freq

Browse source 
It can take significant amount of time to find the peer in this type of
a case where an AP connection is forced on a different channel while
going through p2p_find on both devices.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2023-12-14 12:13:20 +02:00 committed by Jouni Malinen
parent 56a944586a
commit 86dd038889
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/hwsim/p2p_utils.py
View file

@ -322,19 +322,20 @@ def go_neg_pin_authorized(i_dev, r_dev, i_intent=None, r_intent=None,
hwsim_utils.test_connectivity_p2p(r_dev, i_dev) hwsim_utils.test_connectivity_p2p(r_dev, i_dev)
return [i_res, r_res] return [i_res, r_res]
def go_neg_init_pbc(i_dev, r_dev, i_intent, res, freq, provdisc): def go_neg_init_pbc(i_dev, r_dev, i_intent, res, freq, provdisc, timeout=20):
logger.debug("Initiate GO Negotiation from i_dev") logger.debug("Initiate GO Negotiation from i_dev")
try: try:
i_res = i_dev.p2p_go_neg_init(r_dev.p2p_dev_addr(), None, "pbc", i_res = i_dev.p2p_go_neg_init(r_dev.p2p_dev_addr(), None, "pbc",
timeout=20, go_intent=i_intent, freq=freq, timeout=timeout, go_intent=i_intent,
provdisc=provdisc) freq=freq, provdisc=provdisc)
logger.debug("i_res: " + str(i_res)) logger.debug("i_res: " + str(i_res))
except Exception as e: except Exception as e:
i_res = None i_res = None
logger.info("go_neg_init_pbc thread caught an exception from p2p_go_neg_init: " + str(e)) logger.info("go_neg_init_pbc thread caught an exception from p2p_go_neg_init: " + str(e))
res.put(i_res) res.put(i_res)
def go_neg_pbc(i_dev, r_dev, i_intent=None, r_intent=None, i_freq=None, r_freq=None, provdisc=False, r_listen=False): def go_neg_pbc(i_dev, r_dev, i_intent=None, r_intent=None, i_freq=None,
r_freq=None, provdisc=False, r_listen=False, timeout=20):
if r_listen: if r_listen:
r_dev.p2p_listen() r_dev.p2p_listen()
else: else:
@ -343,10 +344,12 @@ def go_neg_pbc(i_dev, r_dev, i_intent=None, r_intent=None, i_freq=None, r_freq=N
logger.info("Start GO negotiation " + i_dev.ifname + " -> " + r_dev.ifname) logger.info("Start GO negotiation " + i_dev.ifname + " -> " + r_dev.ifname)
r_dev.dump_monitor() r_dev.dump_monitor()
res = Queue() res = Queue()
t = threading.Thread(target=go_neg_init_pbc, args=(i_dev, r_dev, i_intent, res, i_freq, provdisc)) t = threading.Thread(target=go_neg_init_pbc, args=(i_dev, r_dev, i_intent,
res, i_freq, provdisc,
timeout))
t.start() t.start()
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=15) ev = r_dev.wait_global_event(["P2P-GO-NEG-REQUEST"], timeout=timeout - 5)
if ev is None: if ev is None:
t.join() t.join()
raise Exception("GO Negotiation timed out") raise Exception("GO Negotiation timed out")
@ -357,7 +360,7 @@ def go_neg_pbc(i_dev, r_dev, i_intent=None, r_intent=None, i_freq=None, r_freq=N
logger.debug("Re-initiate GO Negotiation from r_dev") logger.debug("Re-initiate GO Negotiation from r_dev")
try: try:
r_res = r_dev.p2p_go_neg_init(i_dev.p2p_dev_addr(), None, "pbc", r_res = r_dev.p2p_go_neg_init(i_dev.p2p_dev_addr(), None, "pbc",
go_intent=r_intent, timeout=20, go_intent=r_intent, timeout=timeout,
freq=r_freq) freq=r_freq)
except Exception as e: except Exception as e:
logger.info("go_neg_pbc - r_dev.p2p_go_neg_init() exception: " + str(e)) logger.info("go_neg_pbc - r_dev.p2p_go_neg_init() exception: " + str(e))

6
tests/hwsim/test_p2p_channel.py
View file

@ -472,7 +472,8 @@ def test_go_neg_forced_freq_diff_than_bss_freq(dev, apdev):
# GO and peer force the same freq, different than BSS freq, # GO and peer force the same freq, different than BSS freq,
# wpas to become GO # wpas to become GO
[i_res, r_res] = go_neg_pbc(i_dev=dev[1], i_intent=1, i_freq=5180, [i_res, r_res] = go_neg_pbc(i_dev=dev[1], i_intent=1, i_freq=5180,
r_dev=wpas, r_intent=14, r_freq=5180) r_dev=wpas, r_intent=14, r_freq=5180,
timeout=60)
check_grpform_results(i_res, r_res) check_grpform_results(i_res, r_res)
if i_res['freq'] != "5180": if i_res['freq'] != "5180":
raise Exception("P2P group formed on unexpected frequency: " + i_res['freq']) raise Exception("P2P group formed on unexpected frequency: " + i_res['freq'])
@ -486,7 +487,8 @@ def test_go_neg_forced_freq_diff_than_bss_freq(dev, apdev):
# GO and peer force the same freq, different than BSS freq, wpas to # GO and peer force the same freq, different than BSS freq, wpas to
# become client # become client
[i_res2, r_res2] = go_neg_pbc(i_dev=dev[1], i_intent=14, i_freq=2422, [i_res2, r_res2] = go_neg_pbc(i_dev=dev[1], i_intent=14, i_freq=2422,
r_dev=wpas, r_intent=1, r_freq=2422) r_dev=wpas, r_intent=1, r_freq=2422,
timeout=60)
check_grpform_results(i_res2, r_res2) check_grpform_results(i_res2, r_res2)
if i_res2['freq'] != "2422": if i_res2['freq'] != "2422":
raise Exception("P2P group formed on unexpected frequency: " + i_res2['freq']) raise Exception("P2P group formed on unexpected frequency: " + i_res2['freq'])