<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21565">View Change</a></p><div style="white-space:pre-wrap"></div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">process output: do not leak ANSI colors past logged stdout/stderr<br><br>In jenkins, I still saw incidents of the entire log becoming colored<br>after a colored stderr snippet was printed to the log. Make absolutely<br>sure that no unterminated ANSI coloring is leaked.<br><br>Change-Id: Ib9ac1eea4a12d6d43ac8614491f016bbe9ca17b1<br>---<br>M src/osmo_gsm_tester/core/process.py<br>1 file changed, 2 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/core/process.py b/src/osmo_gsm_tester/core/process.py</span><br><span>index 9cde7de..09dce55 100644</span><br><span>--- a/src/osmo_gsm_tester/core/process.py</span><br><span>+++ b/src/osmo_gsm_tester/core/process.py</span><br><span>@@ -338,7 +338,7 @@</span><br><span>         with open(path, 'r') as f:</span><br><span>             if since_mark > 0:</span><br><span>                 f.seek(since_mark)</span><br><span style="color: hsl(0, 100%, 40%);">-            return f.read()</span><br><span style="color: hsl(120, 100%, 40%);">+            return self.end_ansi_colors(f.read())</span><br><span> </span><br><span>     def get_output_file(self, which):</span><br><span>         ''' Return filename for given output '''</span><br><span>@@ -354,7 +354,7 @@</span><br><span>             return None</span><br><span>         out = out.splitlines()</span><br><span>         tail = min(len(out), tail)</span><br><span style="color: hsl(0, 100%, 40%);">-        return prefix + ('\n' + prefix).join(out[-tail:])</span><br><span style="color: hsl(120, 100%, 40%);">+        return prefix + self.end_ansi_colors(('\n' + prefix).join(out[-tail:]))</span><br><span> </span><br><span>     def get_output_mark(self, which):</span><br><span>         '''Usage:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/21565">change 21565</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/+/21565"/><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: Ib9ac1eea4a12d6d43ac8614491f016bbe9ca17b1 </div>
<div style="display:none"> Gerrit-Change-Number: 21565 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@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>