Safely close the access point ssh connection
Note that this may not be the exact cause, but it will
prevent ACTS from crashing after test cleanup when APs
are involved.
Bug: 62949687
Test: act.py ... WifiManager
Change-Id: I102ef67d7ec93585ae6d601f548d5c53c837363c
diff --git a/acts/framework/acts/controllers/access_point.py b/acts/framework/acts/controllers/access_point.py
index 22c7297..9e595cf 100755
--- a/acts/framework/acts/controllers/access_point.py
+++ b/acts/framework/acts/controllers/access_point.py
@@ -227,8 +227,8 @@
# variables represent the interface name, k, and dhcp info, v.
for k, v in dhcp_bss.items():
bss_interface_ip = ipaddress.ip_interface(
- '%s/%s' %
- (dhcp_bss[k].router, dhcp_bss[k].network.netmask))
+ '%s/%s' % (dhcp_bss[k].router,
+ dhcp_bss[k].network.netmask))
self._ip_cmd.set_ipv4_address(str(k), bss_interface_ip)
# Restart the DHCP server with our updated list of subnets.
@@ -252,7 +252,7 @@
interfaces = [_AP_2GHZ_INTERFACE, _AP_5GHZ_INTERFACE, ssid]
# Get the interface name associated with the given ssid.
for interface in interfaces:
- cmd = "iw dev %s info|grep ssid|awk -F' ' '{print $2}'" %(
+ cmd = "iw dev %s info|grep ssid|awk -F' ' '{print $2}'" % (
str(interface))
iw_output = self.ssh.run(cmd)
if 'command failed: No such device' in iw_output.stderr:
@@ -261,7 +261,7 @@
# If the configured ssid is equal to the given ssid, we found
# the right interface.
if iw_output.stdout == ssid:
- cmd = "iw dev %s info|grep addr|awk -F' ' '{print $2}'" %(
+ cmd = "iw dev %s info|grep addr|awk -F' ' '{print $2}'" % (
str(interface))
iw_output = self.ssh.run(cmd)
return iw_output.stdout
@@ -309,3 +309,4 @@
if self._aps:
self.stop_all_aps()
+ self.ssh.close()