From: Jouni Malinen Date: Fri, 27 Nov 2015 17:37:35 +0000 (+0200) Subject: tests: Optimize p2p_go_move_active initial wait X-Git-Tag: hostap_2_6~1310 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=858d12f69a347db07350dacb8c6126d3f6580191;p=thirdparty%2Fhostap.git tests: Optimize p2p_go_move_active initial wait There is no need to wait for the initial client timeout in this type of test sequence since that wait can be cleared by connecting and disconnecting a client to the group. This allows the test case to be executed much more quickly and the dependency on --long can be removed. Signed-off-by: Jouni Malinen --- diff --git a/tests/hwsim/test_p2p_channel.py b/tests/hwsim/test_p2p_channel.py index 9e441a0e7..edda55e04 100644 --- a/tests/hwsim/test_p2p_channel.py +++ b/tests/hwsim/test_p2p_channel.py @@ -713,11 +713,8 @@ def test_p2p_go_move_reg_change(dev, apdev): dev[0].global_request("P2P_SET disallow_freq ") set_country("00") -def test_p2p_go_move_active(dev, apdev, params): - """P2P GO stays in freq although SCM is possible [long]""" - if not params['long']: - raise HwsimSkip("Skip test case with long duration due to --long not specified") - +def test_p2p_go_move_active(dev, apdev): + """P2P GO stays in freq although SCM is possible""" with HWSimRadio(n_channels=2) as (radio, iface): wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') wpas.interface_add(iface) @@ -743,7 +740,14 @@ def _test_p2p_go_move_active(dev, apdev): raise Exception("Unexpected channel %d MHz" % freq) # GO move is not allowed while waiting for initial client connection - time.sleep(20) + connect_cli(dev[0], dev[1], freq=freq) + dev[1].remove_group() + + freq = dev[0].get_group_status_field('freq') + if int(freq) > 2430: + raise Exception("Unexpected freq after initial client: " + freq) + + dev[0].dump_monitor() dev[0].global_request("P2P_SET disallow_freq ") ev = dev[0].wait_group_event(["P2P-REMOVE-AND-REFORM-GROUP",