[PATCH v2 08/17] tests: use hapd from hostapd.add_iface()
Janusz Dziedzic
janusz.dziedzic at tieto.com
Wed Apr 6 22:38:06 PDT 2016
While add_iface() return correct hapd,
just use it.
Signed-off-by: Janusz Dziedzic <janusz.dziedzic at tieto.com>
---
tests/hwsim/test_ap_acs.py | 4 +---
tests/hwsim/test_ap_dynamic.py | 6 ++----
tests/hwsim/test_ap_vlan.py | 3 +--
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/tests/hwsim/test_ap_acs.py b/tests/hwsim/test_ap_acs.py
index 05e1ad1..89abb24 100644
--- a/tests/hwsim/test_ap_acs.py
+++ b/tests/hwsim/test_ap_acs.py
@@ -89,12 +89,10 @@ def test_ap_acs_chanlist(dev, apdev):
def test_ap_multi_bss_acs(dev, apdev):
"""hostapd start with a multi-BSS configuration file using ACS"""
skip_with_fips(dev[0])
- ifname = apdev[0]['ifname']
force_prev_ap_on_24g(apdev[0])
# start the actual test
- hostapd.add_iface(apdev[0], 'multi-bss-acs.conf')
- hapd = hostapd.Hostapd(ifname)
+ hapd = hostapd.add_iface(apdev[0], 'multi-bss-acs.conf')
hapd.enable()
wait_acs(hapd)
diff --git a/tests/hwsim/test_ap_dynamic.py b/tests/hwsim/test_ap_dynamic.py
index 091930d..381a323 100644
--- a/tests/hwsim/test_ap_dynamic.py
+++ b/tests/hwsim/test_ap_dynamic.py
@@ -182,8 +182,7 @@ def test_ap_multi_bss_config(dev, apdev):
ifname2 = apdev[0]['ifname'] + '-2'
ifname3 = apdev[0]['ifname'] + '-3'
logger.info("Set up three BSSes with one configuration file")
- hostapd.add_iface(apdev[0], 'multi-bss.conf', ifname1)
- hapd = hostapd.Hostapd(ifname1)
+ hapd = hostapd.add_iface(apdev[0], 'multi-bss.conf', ifname1)
hapd.enable()
multi_check(dev, [ True, True, True ])
hostapd.remove_bss(apdev[0], ifname2)
@@ -193,8 +192,7 @@ def test_ap_multi_bss_config(dev, apdev):
hostapd.remove_bss(apdev[0], ifname1)
multi_check(dev, [ False, False, False ])
- hostapd.add_iface(apdev[0], 'multi-bss.conf', ifname1)
- hapd = hostapd.Hostapd(ifname1)
+ hapd = hostapd.add_iface(apdev[0], 'multi-bss.conf', ifname1)
hapd.enable()
hostapd.remove_bss(apdev[0], ifname1)
multi_check(dev, [ False, False, False ])
diff --git a/tests/hwsim/test_ap_vlan.py b/tests/hwsim/test_ap_vlan.py
index 79c4166..4caf804 100644
--- a/tests/hwsim/test_ap_vlan.py
+++ b/tests/hwsim/test_ap_vlan.py
@@ -330,8 +330,7 @@ def ap_vlan_iface_cleanup_multibss(dev, apdev, cfgfile):
ifname = apdev[0]['ifname']
# start the actual test
- hostapd.add_iface(apdev[0], cfgfile)
- hapd = hostapd.Hostapd(ifname)
+ hapd = hostapd.add_iface(apdev[0], cfgfile)
hapd1 = hostapd.Hostapd("wlan3-2", 1)
hapd1.enable()
--
1.9.1
More information about the Hostap
mailing list