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

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ttcn3: Don't overwrite output junit file on multiple testsuites<br><br>Change-Id: I803fa8766acb4e90c4a735a420b24ef18ef6b0c9<br>---<br>M sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py<br>M sysmocom/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh<br>2 files changed, 2 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py b/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py</span><br><span>index f0e8667..394e76e 100644</span><br><span>--- a/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py</span><br><span>+++ b/sysmocom/ttcn3/suites/ttcn3_bts_tests/lib/testlib.py</span><br><span>@@ -10,7 +10,7 @@</span><br><span>     bts_tmpl_file = os.path.join(testdir, 'scripts', 'BTS_Tests.cfg.tmpl')</span><br><span>     script_run_dir = tenv.test().get_run_dir().new_dir('ttcn3')</span><br><span>     bts_cfg_file = os.path.join(str(script_run_dir), 'BTS_Tests.cfg')</span><br><span style="color: hsl(0, 100%, 40%);">-    junit_ttcn3_dst_file = os.path.join(str(tenv.suite().trial().get_run_dir()), 'trial-') + tenv.test().basename + '.xml'</span><br><span style="color: hsl(120, 100%, 40%);">+    junit_ttcn3_dst_file = os.path.join(str(tenv.suite().trial().get_run_dir()), 'trial-' + tenv.suite().name() +  '.' + tenv.test().module_name() + '.xml')</span><br><span>     if bts.bts_type() == 'osmo-bts-trx':</span><br><span>         pcu_available = True</span><br><span>         pcu_sk = bts.pcu_socket_path()</span><br><span>diff --git a/sysmocom/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh b/sysmocom/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh</span><br><span>index daac3e0..535268a 100755</span><br><span>--- a/sysmocom/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh</span><br><span>+++ b/sysmocom/ttcn3/suites/ttcn3_bts_tests/scripts/run_ttcn3_docker.sh</span><br><span>@@ -88,6 +88,6 @@</span><br><span> </span><br><span> echo "Copying TTCN3 junit file to $JUNIT_TTCN3_DST_FILE"</span><br><span> cp $VOL_BASE_DIR/bts-tester/junit-xml-*.log $JUNIT_TTCN3_DST_FILE</span><br><span style="color: hsl(0, 100%, 40%);">-sed -i "s#classname='BTS_Tests'#classname='$(basename $JUNIT_TTCN3_DST_FILE)'#g" $JUNIT_TTCN3_DST_FILE</span><br><span style="color: hsl(120, 100%, 40%);">+sed -i "s#classname='BTS_Tests'#classname='$(basename $JUNIT_TTCN3_DST_FILE '.xml')'#g" $JUNIT_TTCN3_DST_FILE</span><br><span> </span><br><span> exit $child_exit_code</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18772">change 18772</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/+/18772"/><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: I803fa8766acb4e90c4a735a420b24ef18ef6b0c9 </div>
<div style="display:none"> Gerrit-Change-Number: 18772 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>