DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Use hapd from hostapd.add_iface()

Browse source 
Since add_iface() now returns the correct hapd, just use it.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
This commit is contained in:
Janusz Dziedzic 2016-04-07 07:38:06 +02:00 committed by Jouni Malinen
parent dc6342de92
commit 50e49cd240
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/hwsim/test_ap_acs.py
View file

@ -89,12 +89,10 @@ def test_ap_acs_chanlist(dev, apdev):
def test_ap_multi_bss_acs(dev, apdev): def test_ap_multi_bss_acs(dev, apdev):
"""hostapd start with a multi-BSS configuration file using ACS""" """hostapd start with a multi-BSS configuration file using ACS"""
skip_with_fips(dev[0]) skip_with_fips(dev[0])
ifname = apdev[0]['ifname']
force_prev_ap_on_24g(apdev[0]) force_prev_ap_on_24g(apdev[0])
# start the actual test # start the actual test
hostapd.add_iface(apdev[0], 'multi-bss-acs.conf') hapd = hostapd.add_iface(apdev[0], 'multi-bss-acs.conf')
hapd = hostapd.Hostapd(ifname)
hapd.enable() hapd.enable()
wait_acs(hapd) wait_acs(hapd)

6
tests/hwsim/test_ap_dynamic.py
View file

@ -182,8 +182,7 @@ def test_ap_multi_bss_config(dev, apdev):
ifname2 = apdev[0]['ifname'] + '-2' ifname2 = apdev[0]['ifname'] + '-2'
ifname3 = apdev[0]['ifname'] + '-3' ifname3 = apdev[0]['ifname'] + '-3'
logger.info("Set up three BSSes with one configuration file") logger.info("Set up three BSSes with one configuration file")
hostapd.add_iface(apdev[0], 'multi-bss.conf') hapd = hostapd.add_iface(apdev[0], 'multi-bss.conf')
hapd = hostapd.Hostapd(ifname1)
hapd.enable() hapd.enable()
multi_check(dev, [ True, True, True ]) multi_check(dev, [ True, True, True ])
hostapd.remove_bss(apdev[0], ifname2) hostapd.remove_bss(apdev[0], ifname2)
@ -193,8 +192,7 @@ def test_ap_multi_bss_config(dev, apdev):
hostapd.remove_bss(apdev[0], ifname1) hostapd.remove_bss(apdev[0], ifname1)
multi_check(dev, [ False, False, False ]) multi_check(dev, [ False, False, False ])
hostapd.add_iface(apdev[0], 'multi-bss.conf') hapd = hostapd.add_iface(apdev[0], 'multi-bss.conf')
hapd = hostapd.Hostapd(ifname1)
hapd.enable() hapd.enable()
hostapd.remove_bss(apdev[0], ifname1) hostapd.remove_bss(apdev[0], ifname1)
multi_check(dev, [ False, False, False ]) multi_check(dev, [ False, False, False ])

5
tests/hwsim/test_ap_vlan.py
View file

@ -327,11 +327,8 @@ def ap_vlan_iface_cleanup_multibss(dev, apdev, cfgfile):
"vlan_naming": "1" } "vlan_naming": "1" }
authserv = hostapd.add_ap(apdev[1], as_params) authserv = hostapd.add_ap(apdev[1], as_params)
ifname = apdev[0]['ifname']
# start the actual test # start the actual test
hostapd.add_iface(apdev[0], cfgfile) hapd = hostapd.add_iface(apdev[0], cfgfile)
hapd = hostapd.Hostapd(ifname)
hapd1 = hostapd.Hostapd("wlan3-2", 1) hapd1 = hostapd.Hostapd("wlan3-2", 1)
hapd1.enable() hapd1.enable()