@@ -440,10 +440,10 @@ def test_autogo_bridge(dev):
autogo(dev[0])
subprocess.call(['sudo', 'brctl', 'addbr', 'p2p-br0'])
subprocess.call(['sudo', 'brctl', 'setfd', 'p2p-br0', '0'])
- subprocess.call(['sudo', 'brctl', 'addif', 'p2p-br0', dev[0].ifname])
+ subprocess.call(['sudo', 'brctl', 'addif', 'p2p-br0', dev[0].get_group_ifname()])
subprocess.call(['sudo', 'ip', 'link', 'set', 'dev', 'p2p-br0', 'up'])
time.sleep(0.1)
- subprocess.call(['sudo', 'brctl', 'delif', 'p2p-br0', dev[0].ifname])
+ subprocess.call(['sudo', 'brctl', 'delif', 'p2p-br0', dev[0].get_group_ifname()])
time.sleep(0.1)
subprocess.call(['sudo', 'ip', 'link', 'set', 'dev', 'p2p-br0', 'down'])
time.sleep(0.1)
@@ -451,17 +451,17 @@ def test_autogo_bridge(dev):
ev = dev[0].wait_global_event(["P2P-GROUP-REMOVED"], timeout=1)
if ev is not None:
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")
- dev[0].remove_group()
finally:
dev[0].request("AUTOSCAN ")
- subprocess.Popen(['sudo', 'brctl', 'delif', 'p2p-br0', dev[0].ifname],
+ subprocess.Popen(['sudo', 'brctl', 'delif', 'p2p-br0', dev[0].get_group_ifname()],
stderr=open('/dev/null', 'w'))
subprocess.Popen(['sudo', 'ip', 'link', 'set', 'dev', 'p2p-br0', 'down'],
stderr=open('/dev/null', 'w'))
subprocess.Popen(['sudo', 'brctl', 'delbr', 'p2p-br0'],
stderr=open('/dev/null', 'w'))
+ dev[0].remove_group()
def test_presence_req_on_group_interface(dev):
"""P2P_PRESENCE_REQ on group interface"""
@@ -1041,3 +1041,6 @@ class WpaSupplicant:
if ev is None:
raise Exception(error)
return ev
+
+ def get_group_ifname(self):
+ return self.group_ifname if self.group_ifname else self.ifname