commit a4bb6d315be17e1451bac0b6d4c33a0dd27ad276
author Pau Espin Pedrol <pespin@sysmocom.de> Thu Jun 11 16:14:47 2020 +0200
committer Pau Espin Pedrol <pespin@sysmocom.de> Thu Jun 11 16:23:54 2020 +0200
tree a4258506468346e8b202baada208c2a03cbd8073
parent 3b49d464644576e9d932e1b0e92048c98b903b75

testenv: Add debug log when overlaying templates dir

Change-Id: I10fdfc5b2e3bf4c96941a3fae53230131f384de9

selftest/suite_test/suite_test.ok

diff --git a/selftest/suite_test/suite_test.ok b/selftest/suite_test/suite_test.ok
index a7c6422..9c9f5cc 100644
--- a/selftest/suite_test/suite_test.ok
+++ b/selftest/suite_test/suite_test.ok
@@ -639,8 +639,10 @@
 trial suiteC test_template_overlay.py
 ----------------------------------------------
 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]]
+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]]
 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]]
 tst test_template_overlay.py:[LINENR]:   [suiteC↪test_template_overlay.py:[LINENR]]  [test_template_overlay.py:[LINENR]]
+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]]
 --- ReservedResources: DBG: requesting use of ip_address {specifics={}}  [resource.py:[LINENR]]
 tst suiteC: Using 1 x ip_address (candidates: 1)  [resource.py:[LINENR]]
 tst suiteC: DBG: Picked - _hash: fd103b22c7cf2480d609150e06f4bbd92ac78d8c
@@ -705,6 +707,7 @@
   local-ip 10.42.42.2
   [suiteC↪test_template_overlay.py:[LINENR]↪test_template_overlay.py↪osmo-stp_10.42.42.2]  [stp_osmo.py:[LINENR]]
 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]]
+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]]
 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]]
 run osmo-stp_10.42.42.2: DBG: STP CONFIG:
 {'stp': {'ip_address': {'_hash': 'fd103b22c7cf2480d609150e06f4bbd92ac78d8c',

src/osmo_gsm_tester/testenv.py

diff --git a/src/osmo_gsm_tester/testenv.py b/src/osmo_gsm_tester/testenv.py
index 4709b4c..d6c18ee 100644
--- a/src/osmo_gsm_tester/testenv.py
+++ b/src/osmo_gsm_tester/testenv.py
@@ -154,6 +154,7 @@
         if template_dir is None:
             template.set_templates_dir(template.default_templates_dir())
         else:
+            self.dbg('template dir overlay set: %s' % template_dir)
             template.set_templates_dir(template_dir, template.default_templates_dir())
 
     def prompt(self, *msgs, **msg_details):