diff options
| -rw-r--r-- | igor.py | 4 | ||||
| -rw-r--r-- | tests/coveragetest.py | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -104,7 +104,9 @@ def run_tests(tracer, *runner_args): """The actual running of tests.""" if 'COVERAGE_TESTING' not in os.environ: os.environ['COVERAGE_TESTING'] = "True" - os.environ['COVERAGE_ENV_ID'] = make_env_id(tracer) + # $set_env.py: COVERAGE_ENV_ID - Use environment-specific test directories. + if 'COVERAGE_ENV_ID' in os.environ: + os.environ['COVERAGE_ENV_ID'] = make_env_id(tracer) print_banner(label_for_tracer(tracer)) return pytest.main(list(runner_args)) diff --git a/tests/coveragetest.py b/tests/coveragetest.py index 15109134..dcb984b3 100644 --- a/tests/coveragetest.py +++ b/tests/coveragetest.py @@ -81,7 +81,9 @@ class CoverageTest( show_stderr = True # Temp dirs go to $TMPDIR/coverage_test/* - temp_dir_prefix = "coverage_test/{}/".format(os.getenv('COVERAGE_ENV_ID', 'x')) + temp_dir_prefix = "coverage_test/" + if os.getenv('COVERAGE_ENV_ID'): + temp_dir_prefix += "{}/".format(os.getenv('COVERAGE_ENV_ID')) # Keep the temp directories if the env says to. # $set_env.py: COVERAGE_KEEP_TMP - Keep the temp directories made by tests. |