<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11749">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nanobts: ipacces-config: Use process.launch_sync helper<br><br>Change-Id: I986ba81d766240d4f11c079d90b126bf96d776b9<br>---<br>M src/osmo_gsm_tester/bts_nanobts.py<br>1 file changed, 3 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/bts_nanobts.py b/src/osmo_gsm_tester/bts_nanobts.py</span><br><span>index bec2433..ab75b16 100644</span><br><span>--- a/src/osmo_gsm_tester/bts_nanobts.py</span><br><span>+++ b/src/osmo_gsm_tester/bts_nanobts.py</span><br><span>@@ -253,7 +253,7 @@</span><br><span> self.bts_ip = bts_ip</span><br><span> self.env = {}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- def launch_process(self, binary_name, *args):</span><br><span style="color: hsl(120, 100%, 40%);">+ def create_process(self, binary_name, *args):</span><br><span> binary = os.path.abspath(self.inst.child('bin', binary_name))</span><br><span> run_dir = self.run_dir.new_dir(binary_name)</span><br><span> if not os.path.isfile(binary):</span><br><span>@@ -261,7 +261,6 @@</span><br><span> proc = process.Process(binary_name, run_dir,</span><br><span> (binary,) + args,</span><br><span> env=self.env)</span><br><span style="color: hsl(0, 100%, 40%);">- proc.launch()</span><br><span> return proc</span><br><span> </span><br><span> def run(self, name_suffix, *args):</span><br><span>@@ -269,13 +268,8 @@</span><br><span> self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-bsc')))</span><br><span> lib = self.inst.child('lib')</span><br><span> self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }</span><br><span style="color: hsl(0, 100%, 40%);">- self.proc = self.launch_process(IpAccessConfig.BIN_IPACCESS_CONFIG, *args)</span><br><span style="color: hsl(0, 100%, 40%);">- try:</span><br><span style="color: hsl(0, 100%, 40%);">- MainLoop.wait(self, self.proc.terminated)</span><br><span style="color: hsl(0, 100%, 40%);">- except Exception as e:</span><br><span style="color: hsl(0, 100%, 40%);">- self.proc.terminate()</span><br><span style="color: hsl(0, 100%, 40%);">- raise e</span><br><span style="color: hsl(0, 100%, 40%);">- return self.proc.result</span><br><span style="color: hsl(120, 100%, 40%);">+ self.proc = self.create_process(IpAccessConfig.BIN_IPACCESS_CONFIG, *args)</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.proc.launch_sync(raise_nonsuccess=False)</span><br><span> </span><br><span> def set_unit_id(self, unitid, trx_num, restart=False):</span><br><span> uid_str = '%d/0/%d' % (unitid, trx_num)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11749">change 11749</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/11749"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I986ba81d766240d4f11c079d90b126bf96d776b9 </div>
<div style="display:none"> Gerrit-Change-Number: 11749 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>