summaryrefslogtreecommitdiff
path: root/coverage/control.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2012-12-09 15:50:39 -0500
committerNed Batchelder <ned@nedbatchelder.com>2012-12-09 15:50:39 -0500
commitd85f985433d351d8f80370d138368c8deefad47c (patch)
treec94442e7376657ac4e447658f672bd2be38be240 /coverage/control.py
parent36ef251d6202102afd115084aacc868b9c520a21 (diff)
downloadpython-coveragepy-git-d85f985433d351d8f80370d138368c8deefad47c.tar.gz
Get meta-coverage working on sub-processes.
Diffstat (limited to 'coverage/control.py')
-rw-r--r--coverage/control.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/coverage/control.py b/coverage/control.py
index 1a475a58..309343b7 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -465,6 +465,8 @@ class coverage(object):
for pattern in paths[1:]:
aliases.add(pattern, result)
self.data.combine_parallel_data(aliases=aliases)
+ # Combining is a kind of harvesting.
+ self._harvested = True
def _harvest_data(self):
"""Get the collected data and reset the collector.
@@ -702,11 +704,9 @@ def process_startup():
cps = os.environ.get("COVERAGE_PROCESS_START")
if cps:
cov = coverage(config_file=cps, auto_data=True)
- if os.environ.get("COVERAGE_COVERAGE"):
- # Measuring coverage within coverage.py takes yet more trickery.
- cov.cover_dir = "Please measure coverage.py!"
cov.start()
cov._warn_no_data = False
-_TEST_NAME_FILE = "/tmp/covtest.txt" # r"c:\foo\covtest.txt"
+# A hack for debugging testing in subprocesses.
+_TEST_NAME_FILE = "" #"/tmp/covtest.txt"