<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11459">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">process: Make sure sync process is terminated if ogt is stopped<br><br>Change-Id: Iecdac96ea576a312be2a6c6b6799e249074687ef<br>---<br>M src/osmo_gsm_tester/process.py<br>1 file changed, 13 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/59/11459/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/process.py b/src/osmo_gsm_tester/process.py</span><br><span>index 534cdba..fb5c6f6 100644</span><br><span>--- a/src/osmo_gsm_tester/process.py</span><br><span>+++ b/src/osmo_gsm_tester/process.py</span><br><span>@@ -236,25 +236,26 @@</span><br><span>                                      ' '.join(self.popen_args))]</span><br><span>         self.dbg(self.popen_args, dir=self.run_dir, conf=self.popen_kwargs)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def run_proc_sync(proc):</span><br><span style="color: hsl(120, 100%, 40%);">+    try:</span><br><span style="color: hsl(120, 100%, 40%);">+        proc.launch()</span><br><span style="color: hsl(120, 100%, 40%);">+        proc.wait()</span><br><span style="color: hsl(120, 100%, 40%);">+    except Exception as e:</span><br><span style="color: hsl(120, 100%, 40%);">+        proc.terminate()</span><br><span style="color: hsl(120, 100%, 40%);">+        raise e</span><br><span style="color: hsl(120, 100%, 40%);">+    if proc.result != 0:</span><br><span style="color: hsl(120, 100%, 40%);">+        log.ctx(proc)</span><br><span style="color: hsl(120, 100%, 40%);">+        raise log.Error('Exited in error')</span><br><span> </span><br><span> def run_local_sync(run_dir, name, popen_args):</span><br><span>     run_dir =run_dir.new_dir(name)</span><br><span>     proc = Process(name, run_dir, popen_args)</span><br><span style="color: hsl(0, 100%, 40%);">-    proc.launch()</span><br><span style="color: hsl(0, 100%, 40%);">-    proc.wait()</span><br><span style="color: hsl(0, 100%, 40%);">-    if proc.result != 0:</span><br><span style="color: hsl(0, 100%, 40%);">-        log.ctx(proc)</span><br><span style="color: hsl(0, 100%, 40%);">-        raise log.Error('Exited in error')</span><br><span style="color: hsl(120, 100%, 40%);">+    run_proc_sync(proc)</span><br><span> </span><br><span> def run_remote_sync(run_dir, remote_user, remote_addr, name, popen_args, remote_cwd=None):</span><br><span>     run_dir = run_dir.new_dir(name)</span><br><span style="color: hsl(0, 100%, 40%);">-    proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd,</span><br><span style="color: hsl(0, 100%, 40%);">-                                 popen_args)</span><br><span style="color: hsl(0, 100%, 40%);">-    proc.launch()</span><br><span style="color: hsl(0, 100%, 40%);">-    proc.wait()</span><br><span style="color: hsl(0, 100%, 40%);">-    if proc.result != 0:</span><br><span style="color: hsl(0, 100%, 40%);">-        log.ctx(proc)</span><br><span style="color: hsl(0, 100%, 40%);">-        raise log.Error('Exited in error')</span><br><span style="color: hsl(120, 100%, 40%);">+    proc = RemoteProcess(name, run_dir, remote_user, remote_addr, remote_cwd, popen_args)</span><br><span style="color: hsl(120, 100%, 40%);">+    run_proc_sync(proc)</span><br><span> </span><br><span> def scp(run_dir, remote_user, remote_addr, name, local_path, remote_path):</span><br><span>     run_local_sync(run_dir, name, ('scp', '-r', local_path, '%s@%s:%s' % (remote_user, remote_addr, remote_path)))</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11459">change 11459</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/11459"/><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: Iecdac96ea576a312be2a6c6b6799e249074687ef </div>
<div style="display:none"> Gerrit-Change-Number: 11459 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>