diff --git a/src/pytest_cov/engine.py b/src/pytest_cov/engine.py index bb82a377..89ead76c 100644 --- a/src/pytest_cov/engine.py +++ b/src/pytest_cov/engine.py @@ -40,7 +40,7 @@ def set_env(self): os.environ['COV_CORE_CONFIG'] = config_file else: os.environ['COV_CORE_CONFIG'] = '' - os.environ['COV_CORE_DATAFILE'] = os.path.abspath('.coverage') + os.environ['COV_CORE_DATAFILE'] = os.path.abspath(self.cov.config.data_file) if self.cov_branch: os.environ['COV_CORE_BRANCH'] = 'enabled' diff --git a/tests/test_pytest_cov.py b/tests/test_pytest_cov.py index 1a25f7bd..2cdbbde0 100644 --- a/tests/test_pytest_cov.py +++ b/tests/test_pytest_cov.py @@ -698,14 +698,14 @@ def test_invalid_coverage_source(testdir): '*10 passed*' ]) result.stderr.fnmatch_lines([ - 'Coverage.py warning: No data was collected.' + 'Coverage.py warning: No data was collected.*' ]) if StrictVersion(coverage.__version__) <= StrictVersion("3.8"): # older `coverage report` doesn't error on missing imports assert result.ret == 0 else: - # newer `coverage report` errors on missing importts + # newer `coverage report` errors on missing imports result.stderr.fnmatch_lines([ 'ERROR: Failed to generate report: No data to report.', ])