<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17252">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add test log to junit output<br><br>Change-Id: Ieb5566a41ecf3a9512db579eb37e8d8ed5325057<br>---<br>M src/osmo_gsm_tester/log.py<br>M src/osmo_gsm_tester/report.py<br>M src/osmo_gsm_tester/test.py<br>3 files changed, 16 insertions(+), 1 deletion(-)<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/52/17252/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/log.py b/src/osmo_gsm_tester/log.py</span><br><span>index 7c4ae44..d60bf0b 100644</span><br><span>--- a/src/osmo_gsm_tester/log.py</span><br><span>+++ b/src/osmo_gsm_tester/log.py</span><br><span>@@ -574,6 +574,9 @@</span><br><span> self.log_file.flush()</span><br><span> self.log_file.close()</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def log_file_path(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.path</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def run_logging_exceptions(func, *func_args, return_on_failure=None, **func_kwargs):</span><br><span> try:</span><br><span> return func(*func_args, **func_kwargs)</span><br><span>diff --git a/src/osmo_gsm_tester/report.py b/src/osmo_gsm_tester/report.py</span><br><span>index 4919937..6ee3464 100644</span><br><span>--- a/src/osmo_gsm_tester/report.py</span><br><span>+++ b/src/osmo_gsm_tester/report.py</span><br><span>@@ -20,6 +20,7 @@</span><br><span> import math</span><br><span> from datetime import datetime</span><br><span> import xml.etree.ElementTree as et</span><br><span style="color: hsl(120, 100%, 40%);">+from xml.sax.saxutils import escape</span><br><span> from . import test</span><br><span> </span><br><span> def trial_to_junit_write(trial, junit_path):</span><br><span>@@ -63,6 +64,13 @@</span><br><span> elif t.status != test.Test.PASS:</span><br><span> error = et.SubElement(testcase, 'error')</span><br><span> error.text = 'could not run'</span><br><span style="color: hsl(120, 100%, 40%);">+ sout = et.SubElement(testcase, 'system-out')</span><br><span style="color: hsl(120, 100%, 40%);">+ log_file = t.log_file_path()</span><br><span style="color: hsl(120, 100%, 40%);">+ if log_file is not None:</span><br><span style="color: hsl(120, 100%, 40%);">+ with open(log_file, 'r') as myfile:</span><br><span style="color: hsl(120, 100%, 40%);">+ sout.text = escape(myfile.read())</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ sout.text = 'test log file not available'</span><br><span> return testcase</span><br><span> </span><br><span> def trial_to_text(trial):</span><br><span>diff --git a/src/osmo_gsm_tester/test.py b/src/osmo_gsm_tester/test.py</span><br><span>index 4d4353a..66e8656 100644</span><br><span>--- a/src/osmo_gsm_tester/test.py</span><br><span>+++ b/src/osmo_gsm_tester/test.py</span><br><span>@@ -86,7 +86,6 @@</span><br><span> finally:</span><br><span> if self.log_target:</span><br><span> self.log_target.remove()</span><br><span style="color: hsl(0, 100%, 40%);">- self.log_target = None</span><br><span> </span><br><span> def name(self):</span><br><span> l = log.get_line_for_src(self.path)</span><br><span>@@ -119,4 +118,9 @@</span><br><span> self.status = Test.SKIP</span><br><span> self.duration = 0</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def log_file_path(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ if self.log_target is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ return None</span><br><span style="color: hsl(120, 100%, 40%);">+ return self.log_target.log_file_path()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # vim: expandtab tabstop=4 shiftwidth=4</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/17252">change 17252</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/+/17252"/><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: Ieb5566a41ecf3a9512db579eb37e8d8ed5325057 </div>
<div style="display:none"> Gerrit-Change-Number: 17252 </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-MessageType: newchange </div>