From: Jouni Malinen Date: Tue, 19 Dec 2023 11:03:20 +0000 (+0200) Subject: tests: Make p2p_service_discovery_restart more robust X-Git-Tag: hostap_2_11~611 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f1041b3fb013c06fb61724176904e807b643ddd;p=thirdparty%2Fhostap.git tests: Make p2p_service_discovery_restart more robust Stop and restart P2P_FIND on dev[1] to avoid timing issues where the wait on dev[1] makes the test case fail even though this was trying to verify that dev[0] is reacting quickly enough. Signed-off-by: Jouni Malinen --- diff --git a/tests/hwsim/test_p2p_service.py b/tests/hwsim/test_p2p_service.py index 97dd799ae..9a1fc7fe4 100644 --- a/tests/hwsim/test_p2p_service.py +++ b/tests/hwsim/test_p2p_service.py @@ -593,12 +593,14 @@ def _test_p2p_service_discovery_restart(dev): # implementation every now and then, so run this multiple time and pass the # test if any attempt is fast enough. - for i in range(10): + for i in range(20): + dev[1].p2p_stop_find() dev[0].p2p_stop_find() time.sleep(0.01) dev[0].p2p_listen() dev[1].global_request("P2P_SERV_DISC_REQ " + addr0 + " 02000001") + dev[1].p2p_find(social=True) start = os.times()[4] ev = dev[1].wait_global_event(["P2P-SERV-DISC-RESP"], timeout=10) if ev is None: @@ -608,5 +610,8 @@ def _test_p2p_service_discovery_restart(dev): if end - start < 0.8: break + dev[0].p2p_stop_find() + dev[1].p2p_stop_find() + if end - start > 0.8: raise Exception("Unexpectedly slow second SD Response: " + str(end - start) + " seconds")