diff options
| -rw-r--r-- | requirements.txt | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 6 | ||||
| -rw-r--r-- | xtesting/ci/run_tests.py | 7 |
3 files changed, 10 insertions, 9 deletions
diff --git a/requirements.txt b/requirements.txt index 1db79684..996b6efe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,12 +10,12 @@ robotframework>=4.0 behave>=1.2.6 behave-html-formatter>=0.9.4;python_version>='3.6' mock!=4.0.0,!=4.0.1 # BSD -PrettyTable # BSD +PrettyTable!=3.4.0 # BSD python-subunit # Apache-2.0/BSD os-testr # Apache-2.0 junitxml boto3 # Apache-2.0 lxml!=3.7.0 # BSD ansible-runner!=1.3.5 # Apache 2.0 -pytest # MIT -pytest-html #MPL-2.0 +pytest # MIT +pytest-html #MPL-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 22457d0f..e4cb8415 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,11 +3,11 @@ # process, which may cause wedges in the gate later. coverage!=4.4 # Apache-2.0 mock!=4.0.0,!=4.0.1 # BSD -pytest-cov +pytest-cov # MIT flake8 # MIT pylint # GPLv2 -sphinx!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0,!=3.4.2 # BSD -sphinx-rtd-theme +sphinx!=1.6.6,!=1.6.7,!=2.1.0,!=3.0.0,!=3.4.2,<5.0.0 # BSD +sphinx-rtd-theme # MIT yamllint doc8 # Apache-2.0 bashate # Apache-2.0 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'] |