<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18085">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">selftest/process_test: Fix output changing in new python version<br><br>On older versions apparently upon child termination due to SIGINT<br>subprocess.poll() returned 1. On new python versions (such as 3.8.2),<br>-2 is returned, according to documentation:<br><br>A negative value -N indicates that the child was terminated by signal N (Unix only).<br><br>Let's catch the SIGINT in the child process and exit with a known 42<br>value to fix different behavior.<br><br>Change-Id: I7949ff2b435e91e890061e6840b0f411f8b0a817<br>---<br>M selftest/process_test.ok<br>M selftest/process_test/foo.py<br>2 files changed, 9 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/selftest/process_test.ok b/selftest/process_test.ok</span><br><span>index f168ee3..e40a461 100644</span><br><span>--- a/selftest/process_test.ok</span><br><span>+++ b/selftest/process_test.ok</span><br><span>@@ -13,21 +13,18 @@</span><br><span> </span><br><span> run foo(pid=[PID]): Terminating (SIGINT)</span><br><span> run foo(pid=[PID]): DBG: Cleanup</span><br><span style="color: hsl(0, 100%, 40%);">-run foo(pid=[PID]): Terminated {rc=1}</span><br><span style="color: hsl(0, 100%, 40%);">-result: 1</span><br><span style="color: hsl(120, 100%, 40%);">+run foo(pid=[PID]): Terminated {rc=42}</span><br><span style="color: hsl(120, 100%, 40%);">+result: 42</span><br><span> stdout:</span><br><span> (launched: [DATETIME])</span><br><span> foo stdout</span><br><span> [[$0], 'arg1', 'arg2']</span><br><span style="color: hsl(120, 100%, 40%);">+SIGINT received</span><br><span> Exiting (stdout)</span><br><span> </span><br><span> stderr:</span><br><span> (launched: [DATETIME])</span><br><span> foo stderr</span><br><span style="color: hsl(0, 100%, 40%);">-Traceback (most recent call last):</span><br><span style="color: hsl(0, 100%, 40%);">-  File [$0], line [LINE], in <module></span><br><span style="color: hsl(0, 100%, 40%);">-    time.sleep(1)</span><br><span style="color: hsl(0, 100%, 40%);">-KeyboardInterrupt</span><br><span> Exiting (stderr)</span><br><span> </span><br><span> done.</span><br><span>diff --git a/selftest/process_test/foo.py b/selftest/process_test/foo.py</span><br><span>index 4abe887..0931c9b 100755</span><br><span>--- a/selftest/process_test/foo.py</span><br><span>+++ b/selftest/process_test/foo.py</span><br><span>@@ -3,7 +3,13 @@</span><br><span> import sys</span><br><span> import atexit</span><br><span> import time</span><br><span style="color: hsl(120, 100%, 40%);">+import signal</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def signal_handler(sig, frame):</span><br><span style="color: hsl(120, 100%, 40%);">+    print('SIGINT received')</span><br><span style="color: hsl(120, 100%, 40%);">+    sys.exit(42)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+signal.signal(signal.SIGINT, signal_handler)</span><br><span> </span><br><span> sys.stdout.write('foo stdout\n')</span><br><span> sys.stderr.write('foo stderr\n')</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18085">change 18085</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/c/osmo-gsm-tester/+/18085"/><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-Change-Id: I7949ff2b435e91e890061e6840b0f411f8b0a817 </div>
<div style="display:none"> Gerrit-Change-Number: 18085 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>