From d18df681b0bae6ee4bd42acafa43a672725e1eba Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 27 Nov 2015 19:27:25 +0200 Subject: [PATCH] tests: Convert p2p_go_move_scm_peer_does_not_support to dynamic hwsim Use a dynamically added HWSimRadio to allow the MCC case to be covered with a single test run with the mac80211_hwsim default radios disabling MCC. In addition, remove dependency on --long since this test case does not really take that long. Signed-off-by: Jouni Malinen --- tests/hwsim/test_p2p_channel.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/hwsim/test_p2p_channel.py b/tests/hwsim/test_p2p_channel.py index 2ef0f5e88..11db5bb10 100644 --- a/tests/hwsim/test_p2p_channel.py +++ b/tests/hwsim/test_p2p_channel.py @@ -850,14 +850,19 @@ def _test_p2p_go_move_scm_peer_supports(dev, apdev): dev[0].global_request("SET p2p_go_freq_change_policy 2") set_country("00") -def test_p2p_go_move_scm_peer_does_not_support(dev, apdev, params): - """No P2P GO move due to SCM operation (peer does not supports) [long]""" - if dev[0].get_mcc() <= 1: - raise HwsimSkip("Skip due to MCC not being enabled") +def test_p2p_go_move_scm_peer_does_not_support(dev, apdev): + """No P2P GO move due to SCM operation (peer does not supports)""" + with HWSimRadio(n_channels=2) as (radio, iface): + wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') + wpas.interface_add(iface) - if not params['long']: - raise HwsimSkip("Skip test case with long duration due to --long not specified") + if wpas.get_mcc() < 2: + raise Exception("New radio does not support MCC") + ndev = [ wpas, dev[1] ] + _test_p2p_go_move_scm_peer_does_not_support(ndev, apdev) + +def _test_p2p_go_move_scm_peer_does_not_support(dev, apdev): try: dev[0].global_request("SET p2p_go_freq_change_policy 1") set_country("US", dev[0])