From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 18 Jan 2024 10:13:10 +0000 (+0100)
Subject: Don't override env values via testcases.yaml if they exist
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a337116e0a023c2cfcbe4a4c56da4e8be15afae0;p=functest-xtesting.git

Don't override env values via testcases.yaml if they exist

Change-Id: I0d7a52f8bae37ea09f15a5344ee1f7d19d0ecd77
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/xtesting/ci/run_tests.py b/xtesting/ci/run_tests.py
index b8c4a803..5b0baf03 100644
--- a/xtesting/ci/run_tests.py
+++ b/xtesting/ci/run_tests.py
@@ -170,10 +170,11 @@ class Runner():
                     LOGGER.info("Test result:\n\n%s\n", test_case)
                     return testcase.TestCase.EX_TESTCASE_SKIPPED
                 if 'env' in run_dict:
-                    LOGGER.info(
-                        "Setting env for test case '%s'...", test.get_name())
                     for key, value in run_dict['env'].items():
-                        os.environ[key] = str(value)
+                        if key not in os.environ:
+                            LOGGER.info("Setting env for test case '%s'...",
+                                        test.get_name())
+                            os.environ[key] = str(value)
                 LOGGER.info("Running test case '%s'...", test.get_name())
                 try:
                     kwargs = run_dict['args']