Code Review
/
functest-xtesting.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
ab72828
)
Don't override env values via testcases.yaml if they exist
24/74524/1
stable/xena
author
Cédric Ollivier
<cedric.ollivier@orange.com>
Thu, 18 Jan 2024 10:13:10 +0000
(11:13 +0100)
committer
Cédric Ollivier
<cedric.ollivier@orange.com>
Thu, 18 Jan 2024 11:24:42 +0000
(12:24 +0100)
Change-Id: I0d7a52f8bae37ea09f15a5344ee1f7d19d0ecd77
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit
a337116e0a023c2cfcbe4a4c56da4e8be15afae0
)
xtesting/ci/run_tests.py
patch
|
blob
|
history
diff --git
a/xtesting/ci/run_tests.py
b/xtesting/ci/run_tests.py
index
57562ef
..
96acffd
100644
(file)
--- 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']