<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18784">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;">testenv: Add debug log when overlaying templates dir<br><br>Change-Id: I10fdfc5b2e3bf4c96941a3fae53230131f384de9<br>---<br>M selftest/suite_test/suite_test.ok<br>M src/osmo_gsm_tester/testenv.py<br>2 files changed, 4 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/selftest/suite_test/suite_test.ok b/selftest/suite_test/suite_test.ok</span><br><span>index a7c6422..9c9f5cc 100644</span><br><span>--- a/selftest/suite_test/suite_test.ok</span><br><span>+++ b/selftest/suite_test/suite_test.ok</span><br><span>@@ -639,8 +639,10 @@</span><br><span> trial suiteC test_template_overlay.py</span><br><span> ----------------------------------------------</span><br><span> tst test_template_overlay.py:[LINENR]: - Testing: expect to fail on invalid templates overlay dir  [suiteC↪test_template_overlay.py:[LINENR]]  [test_template_overlay.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_template_overlay.py:[LINENR] DBG: template dir overlay set: [PATH]/selftest/suite_test/suitedirB/suiteC/nonexistent-templatedir  [suiteC↪test_template_overlay.py:[LINENR]↪test_template_overlay.py]  [testenv.py:[LINENR]]</span><br><span> tst test_template_overlay.py:[LINENR]: sucess: setting non-existing templates dir raised RuntimeError  [suiteC↪test_template_overlay.py:[LINENR]]  [test_template_overlay.py:[LINENR]]</span><br><span> tst test_template_overlay.py:[LINENR]:   [suiteC↪test_template_overlay.py:[LINENR]]  [test_template_overlay.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_template_overlay.py:[LINENR] DBG: template dir overlay set: [PATH]/selftest/suite_test/suitedirB/suiteC/mytemplatedir  [suiteC↪test_template_overlay.py:[LINENR]↪test_template_overlay.py]  [testenv.py:[LINENR]]</span><br><span> --- ReservedResources: DBG: requesting use of ip_address {specifics={}}  [resource.py:[LINENR]]</span><br><span> tst suiteC: Using 1 x ip_address (candidates: 1)  [resource.py:[LINENR]]</span><br><span> tst suiteC: DBG: Picked - _hash: fd103b22c7cf2480d609150e06f4bbd92ac78d8c</span><br><span>@@ -705,6 +707,7 @@</span><br><span>   local-ip 10.42.42.2</span><br><span>   [suiteC↪test_template_overlay.py:[LINENR]↪test_template_overlay.py↪osmo-stp_10.42.42.2]  [stp_osmo.py:[LINENR]]</span><br><span> tst test_template_overlay.py:[LINENR]: - New template is used after re-generating cache with set_overlay_template_dir:  [suiteC↪test_template_overlay.py:[LINENR]]  [test_template_overlay.py:[LINENR]]</span><br><span style="color: hsl(120, 100%, 40%);">+tst test_template_overlay.py:[LINENR] DBG: template dir overlay set: [PATH]/selftest/suite_test/suitedirB/suiteC/mytemplatedir  [suiteC↪test_template_overlay.py:[LINENR]↪test_template_overlay.py]  [testenv.py:[LINENR]]</span><br><span> run osmo-stp_10.42.42.2: DBG: {config_file='test_trial_tmp/test_run_6/suiteC/test_template_overlay.py/osmo-stp_10.42.42_3.2/osmo-stp.cfg'}  [suiteC↪test_template_overlay.py:[LINENR]↪test_template_overlay.py↪osmo-stp_10.42.42.2]  [stp_osmo.py:[LINENR]]</span><br><span> run osmo-stp_10.42.42.2: DBG: STP CONFIG:</span><br><span> {'stp': {'ip_address': {'_hash': 'fd103b22c7cf2480d609150e06f4bbd92ac78d8c',</span><br><span>diff --git a/src/osmo_gsm_tester/testenv.py b/src/osmo_gsm_tester/testenv.py</span><br><span>index 4709b4c..d6c18ee 100644</span><br><span>--- a/src/osmo_gsm_tester/testenv.py</span><br><span>+++ b/src/osmo_gsm_tester/testenv.py</span><br><span>@@ -154,6 +154,7 @@</span><br><span>         if template_dir is None:</span><br><span>             template.set_templates_dir(template.default_templates_dir())</span><br><span>         else:</span><br><span style="color: hsl(120, 100%, 40%);">+            self.dbg('template dir overlay set: %s' % template_dir)</span><br><span>             template.set_templates_dir(template_dir, template.default_templates_dir())</span><br><span> </span><br><span>     def prompt(self, *msgs, **msg_details):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18784">change 18784</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/+/18784"/><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: I10fdfc5b2e3bf4c96941a3fae53230131f384de9 </div>
<div style="display:none"> Gerrit-Change-Number: 18784 </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>