aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanusz Dziedzic <janusz.dziedzic@tieto.com>2016-03-04 09:20:40 (GMT)
committerJouni Malinen <j@w1.fi>2016-03-05 15:44:51 (GMT)
commite3b36d420e9f06a98f046662cece84ea1a480bab (patch)
tree15b28ed5c183e598a9f14d2346930bb433698f20
parent13073011b98ab0a7e8c273c5bfdb6b7d75a4f8ca (diff)
downloadhostap-e3b36d420e9f06a98f046662cece84ea1a480bab.zip
hostap-e3b36d420e9f06a98f046662cece84ea1a480bab.tar.gz
hostap-e3b36d420e9f06a98f046662cece84ea1a480bab.tar.bz2
tests: Add terminate support for hostapd/wpa_supplicant
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
-rw-r--r--tests/hwsim/hostapd.py20
-rw-r--r--tests/hwsim/wpasupplicant.py7
2 files changed, 27 insertions, 0 deletions
diff --git a/tests/hwsim/hostapd.py b/tests/hwsim/hostapd.py
index 54bc578..1b6e23b 100644
--- a/tests/hwsim/hostapd.py
+++ b/tests/hwsim/hostapd.py
@@ -101,6 +101,13 @@ class HostapdGlobal:
words = line.split(":")
return int(words[1])
+ def terminate(self):
+ self.mon.detach()
+ self.mon.close()
+ self.mon = None
+ self.ctrl.terminate()
+ self.ctrl = None
+
class Hostapd:
def __init__(self, ifname, bssidx=0, hostname=None, port=8877):
self.ifname = ifname
@@ -114,6 +121,14 @@ class Hostapd:
self.bssid = None
self.bssidx = bssidx
+ def close_ctrl(self):
+ if self.mon is not None:
+ self.mon.detach()
+ self.mon.close()
+ self.mon = None
+ self.ctrl.close()
+ self.ctrl = None
+
def own_addr(self):
if self.bssid is None:
self.bssid = self.get_status_field('bssid[%d]' % self.bssidx)
@@ -365,6 +380,11 @@ def remove_bss(ifname, hostname=None, port=8878):
hapd_global = HostapdGlobal(hostname=hostname, port=port)
hapd_global.remove(ifname)
+def terminate(hostname=None, port=8878):
+ logger.info("Terminating hostapd")
+ hapd_global = HostapdGlobal(hostname=hostname, port=port)
+ hapd_global.terminate()
+
def wpa2_params(ssid=None, passphrase=None):
params = { "wpa": "2",
"wpa_key_mgmt": "WPA-PSK",
diff --git a/tests/hwsim/wpasupplicant.py b/tests/hwsim/wpasupplicant.py
index e5a07e2..3978b86 100644
--- a/tests/hwsim/wpasupplicant.py
+++ b/tests/hwsim/wpasupplicant.py
@@ -39,6 +39,13 @@ class WpaSupplicant:
else:
self.global_mon = None
+ def terminate(self):
+ if self.global_mon:
+ self.global_mon.detach()
+ self.global_mon = None
+ self.global_ctrl.terminate()
+ self.global_ctrl = None
+
def close_ctrl(self):
if self.global_mon:
self.global_mon.detach()