From 63b87a5aebee031433213e5611883fd1cce95073 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 27 Nov 2015 19:31:44 +0200 Subject: [PATCH] tests: Optimize p2p_go_move_scm_multi 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 --- tests/hwsim/test_p2p_channel.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/hwsim/test_p2p_channel.py b/tests/hwsim/test_p2p_channel.py index bf15de61e..8463023b0 100644 --- a/tests/hwsim/test_p2p_channel.py +++ b/tests/hwsim/test_p2p_channel.py @@ -895,11 +895,8 @@ def _test_p2p_go_move_scm_peer_does_not_support(dev, apdev): dev[0].global_request("SET p2p_go_freq_change_policy 2") set_country("00") -def test_p2p_go_move_scm_multi(dev, apdev, params): - """P2P GO move due to SCM operation preference multiple times [long]""" - if not params['long']: - raise HwsimSkip("Skip test case with long duration due to --long not specified") - +def test_p2p_go_move_scm_multi(dev, apdev): + """P2P GO move due to SCM operation preference multiple times""" with HWSimRadio(n_channels=2) as (radio, iface): wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') wpas.interface_add(iface) @@ -926,7 +923,14 @@ def _test_p2p_go_move_scm_multi(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",