diff --git a/selftest/suite_test/suite_test.ok b/selftest/suite_test/suite_test.ok index 2c49c195..caf5a5b8 100644 --- a/selftest/suite_test/suite_test.ok +++ b/selftest/suite_test/suite_test.ok @@ -1003,8 +1003,7 @@ 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]: success: setting non-existing templates dir raised RuntimeError [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]] diff --git a/selftest/suite_test/suitedirB/suiteC/test_template_overlay.py b/selftest/suite_test/suitedirB/suiteC/test_template_overlay.py index 2dd93782..7d35138c 100644 --- a/selftest/suite_test/suitedirB/suiteC/test_template_overlay.py +++ b/selftest/suite_test/suitedirB/suiteC/test_template_overlay.py @@ -11,7 +11,7 @@ try: sys.stderr.write('Error: setting non-existing templates dir should raise RuntimeError\n') assert(False) except RuntimeError: - print('sucess: setting non-existing templates dir raised RuntimeError\n') + print('success: setting non-existing templates dir raised RuntimeError') pass mytemplatedir = os.path.join(os.path.dirname(__file__), 'mytemplatedir') diff --git a/selftest/template_test/template_test.ok b/selftest/template_test/template_test.ok index 718ef6ef..39b0cd3f 100644 --- a/selftest/template_test/template_test.ok +++ b/selftest/template_test/template_test.ok @@ -189,8 +189,7 @@ ctrl bind val_ip_address - Testing: expect to fail on invalid templates dir -sucess: setting non-existing templates dir raised RuntimeError - +success: setting non-existing templates dir raised RuntimeError - Testing: template directory overlay (still can find default one?) cnf Templates: DBG: rendering osmo-nitb.cfg.tmpl ! Configuration rendered by osmo-gsm-tester diff --git a/selftest/template_test/template_test.py b/selftest/template_test/template_test.py index 52976e55..9dc967f3 100755 --- a/selftest/template_test/template_test.py +++ b/selftest/template_test/template_test.py @@ -89,7 +89,7 @@ try: assert(False) except RuntimeError: # not logging exception to omit non-constant path name from expected output - print('sucess: setting non-existing templates dir raised RuntimeError\n') + print('success: setting non-existing templates dir raised RuntimeError') pass mytemplatedir = os.path.join(os.path.dirname(__file__), 'mytemplatedir')