<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11595">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_driver: Use terminate not kill and initialize in ctor<br><br>Change-Id: Ib0102569cfb64a2f85ff33b93dd4ffc8ec59171b<br>---<br>M src/osmo_ms_driver/starter.py<br>1 file changed, 4 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/95/11595/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py</span><br><span>index 86ad446..5218a57 100644</span><br><span>--- a/src/osmo_ms_driver/starter.py</span><br><span>+++ b/src/osmo_ms_driver/starter.py</span><br><span>@@ -39,6 +39,7 @@</span><br><span>     def __init__(self, name_number, tmp_dir):</span><br><span>         super().__init__("osmo-ms-virt-phy", name_number, tmp_dir)</span><br><span>         self._phy_filename = os.path.join(self._tmp_dir, "osmocom_l2_" + self._name_number)</span><br><span style="color: hsl(120, 100%, 40%);">+        self._vphy_proc = None</span><br><span> </span><br><span>     def phy_filename(self):</span><br><span>         return self._phy_filename</span><br><span>@@ -61,7 +62,7 @@</span><br><span>     def kill(self):</span><br><span>         """Clean up things."""</span><br><span>         if self._vphy_proc:</span><br><span style="color: hsl(0, 100%, 40%);">-            self._vphy_proc.kill()</span><br><span style="color: hsl(120, 100%, 40%);">+            self._vphy_proc.terminate()</span><br><span> </span><br><span> class OsmoMobile(Launcher):</span><br><span>     def __init__(self, name_number, tmp_dir, lua_tmpl, cfg_tmpl, imsi_ki_generator, phy_filename, ev_server_path):</span><br><span>@@ -72,6 +73,7 @@</span><br><span>         self._phy_filename = phy_filename</span><br><span>         self._ev_server_path = ev_server_path</span><br><span>         self._imsi, self._ki = next(self._imsi_ki_generator)</span><br><span style="color: hsl(120, 100%, 40%);">+        self._omob_proc = None</span><br><span> </span><br><span>     def imsi(self):</span><br><span>         return self._imsi</span><br><span>@@ -122,4 +124,4 @@</span><br><span>     def kill(self):</span><br><span>         """Clean up things."""</span><br><span>         if self._omob_proc:</span><br><span style="color: hsl(0, 100%, 40%);">-            self._omob_proc.kill()</span><br><span style="color: hsl(120, 100%, 40%);">+            self._omob_proc.terminate()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11595">change 11595</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11595"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib0102569cfb64a2f85ff33b93dd4ffc8ec59171b </div>
<div style="display:none"> Gerrit-Change-Number: 11595 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>