<p>Holger Freyther has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11597">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_driver: Switch to process.Process from subprocess<br><br>Use a single tmp/rundir for all these instances. In the next step<br>we can create separate directories.<br><br>Change-Id: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004<br>---<br>M src/osmo_ms_driver/__main__.py<br>M src/osmo_ms_driver/starter.py<br>2 files changed, 10 insertions(+), 12 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/97/11597/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py</span><br><span>index 265ce47..0e3611b 100644</span><br><span>--- a/src/osmo_ms_driver/__main__.py</span><br><span>+++ b/src/osmo_ms_driver/__main__.py</span><br><span>@@ -83,7 +83,7 @@</span><br><span> ev_server.listen(loop)</span><br><span> </span><br><span> # Just a single test for now.</span><br><span style="color: hsl(0, 100%, 40%);">- options = BinaryOptions("virtphy", "mobile", None)</span><br><span style="color: hsl(120, 100%, 40%);">+ options = BinaryOptions("virtphy", "mobile", os.environ)</span><br><span> test = MassUpdateLocationTest("lu_test", options, args.num_ms, cdf, ev_server, tmp_dir)</span><br><span> atexit.register(test.stop_all)</span><br><span> </span><br><span>diff --git a/src/osmo_ms_driver/starter.py b/src/osmo_ms_driver/starter.py</span><br><span>index 2ffb33a..4611cd6 100644</span><br><span>--- a/src/osmo_ms_driver/starter.py</span><br><span>+++ b/src/osmo_ms_driver/starter.py</span><br><span>@@ -16,17 +16,13 @@</span><br><span> # You should have received a copy of the GNU General Public License</span><br><span> # along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from osmo_gsm_tester import log, template</span><br><span style="color: hsl(120, 100%, 40%);">+from osmo_gsm_tester import log, process, template</span><br><span> </span><br><span> import collections</span><br><span> import os</span><br><span> import os.path</span><br><span style="color: hsl(0, 100%, 40%);">-import subprocess</span><br><span> import time</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-_devnull = open(os.devnull, 'w')</span><br><span style="color: hsl(0, 100%, 40%);">-#_devnull = open('/dev/stdout', 'w')</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> BinaryOptions = collections.namedtuple("BinaryOptions", ["virtphy", "mobile", "env"])</span><br><span> </span><br><span> class Launcher(log.Origin):</span><br><span>@@ -53,10 +49,11 @@</span><br><span> if len(self._phy_filename.encode()) > 107:</span><br><span> raise log.Error('Path for unix socket is longer than max allowed len for unix socket path (107):', self._phy_filename)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.log("Starting virtphy process")</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log("Starting virtphy")</span><br><span> args = [self._binary, "--l1ctl-sock=" + self._phy_filename]</span><br><span style="color: hsl(0, 100%, 40%);">- self.log(' '.join(args))</span><br><span style="color: hsl(0, 100%, 40%);">- self._vphy_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._vphy_proc = process.Process(self.name(), self._tmp_dir,</span><br><span style="color: hsl(120, 100%, 40%);">+ args, env=self._env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._vphy_proc.launch()</span><br><span> </span><br><span> def verify_ready(self):</span><br><span> while True:</span><br><span>@@ -120,11 +117,12 @@</span><br><span> lua_filename = self.write_lua_cfg()</span><br><span> mob_filename = self.write_mob_cfg(lua_filename, self._phy_filename)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- self.log("Starting process")</span><br><span style="color: hsl(120, 100%, 40%);">+ self.log("Starting mobile")</span><br><span> # Let the kernel pick an unused port for the VTY.</span><br><span> args = [self._binary, "-c", mob_filename, "--vty-port=0"]</span><br><span style="color: hsl(0, 100%, 40%);">- self.log(' '.join(args))</span><br><span style="color: hsl(0, 100%, 40%);">- self._omob_proc = subprocess.Popen(args, stderr=_devnull, stdout=_devnull, env=self._env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._omob_proc = process.Process(self.name(), self._tmp_dir,</span><br><span style="color: hsl(120, 100%, 40%);">+ args, env=self._env)</span><br><span style="color: hsl(120, 100%, 40%);">+ self._omob_proc.launch()</span><br><span> </span><br><span> def kill(self):</span><br><span> """Clean up things."""</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11597">change 11597</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/11597"/><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: Icf4d4e161ac4283a63ed4e0745b375e7e6a25004 </div>
<div style="display:none"> Gerrit-Change-Number: 11597 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>