Change in osmo-gsm-tester[master]: ms_driver: Use terminate not kill and initialize in ctor

[Holger Freyther]

Holger Freyther has submitted this change and it was merged. ( https://gerrit.osmocom.org/11595 )

Change subject: ms_driver: Use terminate not kill and initialize in ctor
......................................................................

ms_driver: Use terminate not kill and initialize in ctor

Change-Id: Ib0102569cfb64a2f85ff33b93dd4ffc8ec59171b
---
M src/osmo_ms_driver/starter.py
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py
index 86ad446..5218a57 100644
--- a/src/osmo_ms_driver/starter.py
+++ b/src/osmo_ms_driver/starter.py
@@ -39,6 +39,7 @@
     def __init__(self, name_number, tmp_dir):
         super().__init__("osmo-ms-virt-phy", name_number, tmp_dir)
         self._phy_filename = os.path.join(self._tmp_dir, "osmocom_l2_" + self._name_number)
+        self._vphy_proc = None
 
     def phy_filename(self):
         return self._phy_filename
@@ -61,7 +62,7 @@
     def kill(self):
         """Clean up things."""
         if self._vphy_proc:
-            self._vphy_proc.kill()
+            self._vphy_proc.terminate()
 
 class OsmoMobile(Launcher):
     def __init__(self, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path):
@@ -72,6 +73,7 @@
         self._phy_filename = phy_filename
         self._ev_server_path = ev_server_path
         self._imsi, self._ki = next(self._imsi_ki_generator)
+        self._omob_proc = None
 
     def imsi(self):
         return self._imsi
@@ -122,4 +124,4 @@
     def kill(self):
         """Clean up things."""
         if self._omob_proc:
-            self._omob_proc.kill()
+            self._omob_proc.terminate()

-- 
To view, visit https://gerrit.osmocom.org/11595
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0102569cfb64a2f85ff33b93dd4ffc8ec59171b
Gerrit-Change-Number: 11595
Gerrit-PatchSet: 2
Gerrit-Owner: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Holger Freyther <holger at freyther.de>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181106/9d878b3c/attachment.htm>