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

tests: Modify autogo_bridge test to use group interface

Browse source 
1. Add get_group_ifname() to wpasupplicant.py
2. Use the function to get the interface name for the bridge.

Signed-off-by: David Spinadel <david.spinadel@intel.com>
This commit is contained in:
David Spinadel 2015-02-05 20:31:00 -05:00 • committed by Jouni Malinen
parent 4ef05faf43
commit bbcbbd3701
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/hwsim/test_p2p_autogo.py
View file

@ -438,12 +438,13 @@ def test_autogo_bridge(dev):
if "OK" not in dev[0].request("AUTOSCAN periodic:1"): if "OK" not in dev[0].request("AUTOSCAN periodic:1"):
raise Exception("Failed to set autoscan") raise Exception("Failed to set autoscan")
autogo(dev[0]) autogo(dev[0])
ifname = dev[0].get_group_ifname()
subprocess.call(['brctl', 'addbr', 'p2p-br0']) subprocess.call(['brctl', 'addbr', 'p2p-br0'])
subprocess.call(['brctl', 'setfd', 'p2p-br0', '0']) subprocess.call(['brctl', 'setfd', 'p2p-br0', '0'])
subprocess.call(['brctl', 'addif', 'p2p-br0', dev[0].ifname]) subprocess.call(['brctl', 'addif', 'p2p-br0', ifname])
subprocess.call(['ip', 'link', 'set', 'dev', 'p2p-br0', 'up']) subprocess.call(['ip', 'link', 'set', 'dev', 'p2p-br0', 'up'])
time.sleep(0.1) time.sleep(0.1)
subprocess.call(['brctl', 'delif', 'p2p-br0', dev[0].ifname]) subprocess.call(['brctl', 'delif', 'p2p-br0', ifname])
time.sleep(0.1) time.sleep(0.1)
subprocess.call(['ip', 'link', 'set', 'dev', 'p2p-br0', 'down']) subprocess.call(['ip', 'link', 'set', 'dev', 'p2p-br0', 'down'])
time.sleep(0.1) time.sleep(0.1)
@ -451,12 +452,12 @@ def test_autogo_bridge(dev):
ev = dev[0].wait_global_event(["P2P-GROUP-REMOVED"], timeout=1) ev = dev[0].wait_global_event(["P2P-GROUP-REMOVED"], timeout=1)
if ev is not None: if ev is not None:
raise Exception("P2P group removed unexpectedly") raise Exception("P2P group removed unexpectedly")
if dev[0].get_status_field('wpa_state') != "COMPLETED": if dev[0].get_group_status_field('wpa_state') != "COMPLETED":
raise Exception("Unexpected wpa_state") raise Exception("Unexpected wpa_state")
dev[0].remove_group() dev[0].remove_group()
finally: finally:
dev[0].request("AUTOSCAN ") dev[0].request("AUTOSCAN ")
subprocess.Popen(['brctl', 'delif', 'p2p-br0', dev[0].ifname], subprocess.Popen(['brctl', 'delif', 'p2p-br0', ifname],
stderr=open('/dev/null', 'w')) stderr=open('/dev/null', 'w'))
subprocess.Popen(['ip', 'link', 'set', 'dev', 'p2p-br0', 'down'], subprocess.Popen(['ip', 'link', 'set', 'dev', 'p2p-br0', 'down'],
stderr=open('/dev/null', 'w')) stderr=open('/dev/null', 'w'))

3
tests/hwsim/wpasupplicant.py
View file

@ -1041,3 +1041,6 @@ class WpaSupplicant:
if ev is None: if ev is None:
raise Exception(error) raise Exception(error)
return ev return ev
def get_group_ifname(self):
return self.group_ifname if self.group_ifname else self.ifname