jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Optimize p2p_go_move_scm_multi initial wait

Browse source 
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 <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-11-27 19:31:44 +02:00
parent 3acf68feb9
commit 63b87a5aeb
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/hwsim/test_p2p_channel.py
View file

@ -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") dev[0].global_request("SET p2p_go_freq_change_policy 2")
set_country("00") set_country("00")
def test_p2p_go_move_scm_multi(dev, apdev, params): def test_p2p_go_move_scm_multi(dev, apdev):
"""P2P GO move due to SCM operation preference multiple times [long]""" """P2P GO move due to SCM operation preference multiple times"""
if not params['long']:
raise HwsimSkip("Skip test case with long duration due to --long not specified")
with HWSimRadio(n_channels=2) as (radio, iface): with HWSimRadio(n_channels=2) as (radio, iface):
wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
wpas.interface_add(iface) wpas.interface_add(iface)
@ -926,7 +923,14 @@ def _test_p2p_go_move_scm_multi(dev, apdev):
raise Exception("Unexpected channel %d MHz" % freq) raise Exception("Unexpected channel %d MHz" % freq)
# GO move is not allowed while waiting for initial client connection # 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 ") dev[0].global_request("P2P_SET disallow_freq ")
ev = dev[0].wait_group_event(["P2P-REMOVE-AND-REFORM-GROUP", ev = dev[0].wait_group_event(["P2P-REMOVE-AND-REFORM-GROUP",