From 5a8d165cd8afa8d27422a2c642caf7a7a2724643 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 20 Oct 2014 12:00:06 +0200 Subject: [PATCH] tests: Use dynamic radio for P2P_DEVICE tests Use dynamic radios for P2P_DEVICE tests to be able to test support when the default in hwsim is to not support it. Signed-off-by: Johannes Berg --- tests/hwsim/test_p2p_device.py | 58 ++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/tests/hwsim/test_p2p_device.py b/tests/hwsim/test_p2p_device.py index b9b481057..a3428f2b1 100644 --- a/tests/hwsim/test_p2p_device.py +++ b/tests/hwsim/test_p2p_device.py @@ -12,39 +12,43 @@ from wpasupplicant import WpaSupplicant from test_p2p_grpform import go_neg_pin_authorized from test_p2p_grpform import check_grpform_results from test_p2p_grpform import remove_group +from hwsim import HWSimRadio def test_p2p_device_grpform(dev, apdev): """P2P group formation with driver using cfg80211 P2P Device""" - wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') - wpas.interface_add("wlan5") - [i_res, r_res] = go_neg_pin_authorized(i_dev=dev[0], i_intent=15, - r_dev=wpas, r_intent=0) - check_grpform_results(i_res, r_res) - remove_group(dev[0], wpas) + with HWSimRadio(use_p2p_device=True) as (radio, iface): + wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') + wpas.interface_add(iface) + [i_res, r_res] = go_neg_pin_authorized(i_dev=dev[0], i_intent=15, + r_dev=wpas, r_intent=0) + check_grpform_results(i_res, r_res) + remove_group(dev[0], wpas) def test_p2p_device_grpform2(dev, apdev): """P2P group formation with driver using cfg80211 P2P Device (reverse)""" - wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') - wpas.interface_add("wlan5") - [i_res, r_res] = go_neg_pin_authorized(i_dev=wpas, i_intent=15, - r_dev=dev[0], r_intent=0) - check_grpform_results(i_res, r_res) - remove_group(wpas, dev[0]) + with HWSimRadio(use_p2p_device=True) as (radio, iface): + wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') + wpas.interface_add(iface) + [i_res, r_res] = go_neg_pin_authorized(i_dev=wpas, i_intent=15, + r_dev=dev[0], r_intent=0) + check_grpform_results(i_res, r_res) + remove_group(wpas, dev[0]) def test_p2p_device_group_remove(dev, apdev): """P2P group removal via the P2P ctrl interface with driver using cfg80211 P2P Device""" - wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') - wpas.interface_add("wlan5") - [i_res, r_res] = go_neg_pin_authorized(i_dev=dev[0], i_intent=15, - r_dev=wpas, r_intent=0) - check_grpform_results(i_res, r_res) - # Issue the remove request on the interface which will be removed - p2p_iface_wpas = WpaSupplicant(ifname=r_res['ifname']) - res = p2p_iface_wpas.request("P2P_GROUP_REMOVE *") - if "OK" not in res: - raise Exception("Failed to remove P2P group") - ev = wpas.wait_global_event(["P2P-GROUP-REMOVED"], timeout=10) - if ev is None: - raise Exception("Group removal event not received") - if not wpas.global_ping(): - raise Exception("Could not ping global ctrl_iface after group removal") + with HWSimRadio(use_p2p_device=True) as (radio, iface): + wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5') + wpas.interface_add(iface) + [i_res, r_res] = go_neg_pin_authorized(i_dev=dev[0], i_intent=15, + r_dev=wpas, r_intent=0) + check_grpform_results(i_res, r_res) + # Issue the remove request on the interface which will be removed + p2p_iface_wpas = WpaSupplicant(ifname=r_res['ifname']) + res = p2p_iface_wpas.request("P2P_GROUP_REMOVE *") + if "OK" not in res: + raise Exception("Failed to remove P2P group") + ev = wpas.wait_global_event(["P2P-GROUP-REMOVED"], timeout=10) + if ev is None: + raise Exception("Group removal event not received") + if not wpas.global_ping(): + raise Exception("Could not ping global ctrl_iface after group removal")