<p>Holger Freyther <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13086">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, but someone else must approve
  Pau Espin Pedrol: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">process: Make sending signals (kill) externally visible<br><br>Change-Id: I87bba8a8c467ba5936e0b6604d8abb9432e5e7a8<br>---<br>M src/osmo_gsm_tester/process.py<br>1 file changed, 9 insertions(+), 9 deletions(-)<br><br></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 1e53aba..3050f83 100644</span><br><span>--- a/src/osmo_gsm_tester/process.py</span><br><span>+++ b/src/osmo_gsm_tester/process.py</span><br><span>@@ -145,6 +145,12 @@</span><br><span>     def send_signal(self, sig):</span><br><span>         os.kill(self.process_obj.pid, sig)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    def kill(self, sig):</span><br><span style="color: hsl(120, 100%, 40%);">+        """Kills the process with the given signal and remembers it."""</span><br><span style="color: hsl(120, 100%, 40%);">+        self.log('Terminating (%s)' % sig.name)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.send_signal(sig)</span><br><span style="color: hsl(120, 100%, 40%);">+        self.killed = sig</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     def terminate(self):</span><br><span>         if self.process_obj is None:</span><br><span>             return</span><br><span>@@ -153,23 +159,17 @@</span><br><span> </span><br><span>         while True:</span><br><span>             # first try SIGINT to allow stdout+stderr flushing</span><br><span style="color: hsl(0, 100%, 40%);">-            self.log('Terminating (SIGINT)')</span><br><span style="color: hsl(0, 100%, 40%);">-            self.send_signal(signal.SIGINT)</span><br><span style="color: hsl(0, 100%, 40%);">-            self.killed = signal.SIGINT</span><br><span style="color: hsl(120, 100%, 40%);">+            self.kill(signal.SIGINT)</span><br><span>             if self._poll_termination():</span><br><span>                 break</span><br><span> </span><br><span>             # SIGTERM maybe?</span><br><span style="color: hsl(0, 100%, 40%);">-            self.log('Terminating (SIGTERM)')</span><br><span style="color: hsl(0, 100%, 40%);">-            self.send_signal(signal.SIGTERM)</span><br><span style="color: hsl(0, 100%, 40%);">-            self.killed = signal.SIGTERM</span><br><span style="color: hsl(120, 100%, 40%);">+            self.kill(signal.SIGTERM)</span><br><span>             if self._poll_termination():</span><br><span>                 break</span><br><span> </span><br><span>             # out of patience</span><br><span style="color: hsl(0, 100%, 40%);">-            self.log('Terminating (SIGKILL)')</span><br><span style="color: hsl(0, 100%, 40%);">-            self.send_signal(signal.SIGKILL)</span><br><span style="color: hsl(0, 100%, 40%);">-            self.killed = signal.SIGKILL</span><br><span style="color: hsl(120, 100%, 40%);">+            self.kill(signal.SIGKILL)</span><br><span>             break;</span><br><span> </span><br><span>         self.process_obj.wait()</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13086">change 13086</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/13086"/><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: I87bba8a8c467ba5936e0b6604d8abb9432e5e7a8 </div>
<div style="display:none"> Gerrit-Change-Number: 13086 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Holger Freyther <holger@freyther.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>