aboutsummaryrefslogtreecommitdiffstats
path: root/xtesting
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2024-01-18 11:13:10 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2024-01-18 12:24:16 +0100
commit2055b877d08c6bf7c2487b44cdd76a815d424eeb (patch)
tree8d194ca96f8a8e295d487992f4706aa1f9253863 /xtesting
parente538e1698ec357eac444578b49dcf4f84bd3ad63 (diff)
Don't override env values via testcases.yaml if they exist
Change-Id: I0d7a52f8bae37ea09f15a5344ee1f7d19d0ecd77 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit a337116e0a023c2cfcbe4a4c56da4e8be15afae0)
Diffstat (limited to 'xtesting')
-rw-r--r--xtesting/ci/run_tests.py7
1 files changed, 4 insertions, 3 deletions
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']