From a337116e0a023c2cfcbe4a4c56da4e8be15afae0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Thu, 18 Jan 2024 11:13:10 +0100 Subject: [PATCH] Don't override env values via testcases.yaml if they exist MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I0d7a52f8bae37ea09f15a5344ee1f7d19d0ecd77 Signed-off-by: Cédric Ollivier --- xtesting/ci/run_tests.py | 7 ++++--- 1 file 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'] -- 2.16.6