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 <johannes.berg@intel.com>
This commit is contained in:
parent
9b2c227216
commit
5a8d165cd8
1 changed files with 31 additions and 27 deletions
|
@ -12,39 +12,43 @@ from wpasupplicant import WpaSupplicant
|
||||||
from test_p2p_grpform import go_neg_pin_authorized
|
from test_p2p_grpform import go_neg_pin_authorized
|
||||||
from test_p2p_grpform import check_grpform_results
|
from test_p2p_grpform import check_grpform_results
|
||||||
from test_p2p_grpform import remove_group
|
from test_p2p_grpform import remove_group
|
||||||
|
from hwsim import HWSimRadio
|
||||||
|
|
||||||
def test_p2p_device_grpform(dev, apdev):
|
def test_p2p_device_grpform(dev, apdev):
|
||||||
"""P2P group formation with driver using cfg80211 P2P Device"""
|
"""P2P group formation with driver using cfg80211 P2P Device"""
|
||||||
wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
|
with HWSimRadio(use_p2p_device=True) as (radio, iface):
|
||||||
wpas.interface_add("wlan5")
|
wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
|
||||||
[i_res, r_res] = go_neg_pin_authorized(i_dev=dev[0], i_intent=15,
|
wpas.interface_add(iface)
|
||||||
r_dev=wpas, r_intent=0)
|
[i_res, r_res] = go_neg_pin_authorized(i_dev=dev[0], i_intent=15,
|
||||||
check_grpform_results(i_res, r_res)
|
r_dev=wpas, r_intent=0)
|
||||||
remove_group(dev[0], wpas)
|
check_grpform_results(i_res, r_res)
|
||||||
|
remove_group(dev[0], wpas)
|
||||||
|
|
||||||
def test_p2p_device_grpform2(dev, apdev):
|
def test_p2p_device_grpform2(dev, apdev):
|
||||||
"""P2P group formation with driver using cfg80211 P2P Device (reverse)"""
|
"""P2P group formation with driver using cfg80211 P2P Device (reverse)"""
|
||||||
wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
|
with HWSimRadio(use_p2p_device=True) as (radio, iface):
|
||||||
wpas.interface_add("wlan5")
|
wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
|
||||||
[i_res, r_res] = go_neg_pin_authorized(i_dev=wpas, i_intent=15,
|
wpas.interface_add(iface)
|
||||||
r_dev=dev[0], r_intent=0)
|
[i_res, r_res] = go_neg_pin_authorized(i_dev=wpas, i_intent=15,
|
||||||
check_grpform_results(i_res, r_res)
|
r_dev=dev[0], r_intent=0)
|
||||||
remove_group(wpas, dev[0])
|
check_grpform_results(i_res, r_res)
|
||||||
|
remove_group(wpas, dev[0])
|
||||||
|
|
||||||
def test_p2p_device_group_remove(dev, apdev):
|
def test_p2p_device_group_remove(dev, apdev):
|
||||||
"""P2P group removal via the P2P ctrl interface with driver using cfg80211 P2P Device"""
|
"""P2P group removal via the P2P ctrl interface with driver using cfg80211 P2P Device"""
|
||||||
wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
|
with HWSimRadio(use_p2p_device=True) as (radio, iface):
|
||||||
wpas.interface_add("wlan5")
|
wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
|
||||||
[i_res, r_res] = go_neg_pin_authorized(i_dev=dev[0], i_intent=15,
|
wpas.interface_add(iface)
|
||||||
r_dev=wpas, r_intent=0)
|
[i_res, r_res] = go_neg_pin_authorized(i_dev=dev[0], i_intent=15,
|
||||||
check_grpform_results(i_res, r_res)
|
r_dev=wpas, r_intent=0)
|
||||||
# Issue the remove request on the interface which will be removed
|
check_grpform_results(i_res, r_res)
|
||||||
p2p_iface_wpas = WpaSupplicant(ifname=r_res['ifname'])
|
# Issue the remove request on the interface which will be removed
|
||||||
res = p2p_iface_wpas.request("P2P_GROUP_REMOVE *")
|
p2p_iface_wpas = WpaSupplicant(ifname=r_res['ifname'])
|
||||||
if "OK" not in res:
|
res = p2p_iface_wpas.request("P2P_GROUP_REMOVE *")
|
||||||
raise Exception("Failed to remove P2P group")
|
if "OK" not in res:
|
||||||
ev = wpas.wait_global_event(["P2P-GROUP-REMOVED"], timeout=10)
|
raise Exception("Failed to remove P2P group")
|
||||||
if ev is None:
|
ev = wpas.wait_global_event(["P2P-GROUP-REMOVED"], timeout=10)
|
||||||
raise Exception("Group removal event not received")
|
if ev is None:
|
||||||
if not wpas.global_ping():
|
raise Exception("Group removal event not received")
|
||||||
raise Exception("Could not ping global ctrl_iface after group removal")
|
if not wpas.global_ping():
|
||||||
|
raise Exception("Could not ping global ctrl_iface after group removal")
|
||||||
|
|
Loading…
Reference in a new issue