summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--igor.py2
-rw-r--r--tests/coveragetest.py7
-rw-r--r--tests/test_process.py3
3 files changed, 4 insertions, 8 deletions
diff --git a/igor.py b/igor.py
index 3850ce76..56674c06 100644
--- a/igor.py
+++ b/igor.py
@@ -131,7 +131,7 @@ def run_tests_with_coverage(tracer, *runner_args):
os.environ['COVERAGE_METAFILE'] = os.path.abspath(".metacov."+suffix)
import coverage
- cov = coverage.Coverage(config_file="metacov.ini", data_suffix=False)
+ cov = coverage.Coverage(config_file="metacov.ini")
cov._warn_unimported_source = False
cov._warn_preimported_source = False
cov.start()
diff --git a/tests/coveragetest.py b/tests/coveragetest.py
index 85af3623..1a2983e6 100644
--- a/tests/coveragetest.py
+++ b/tests/coveragetest.py
@@ -431,13 +431,6 @@ class CoverageTest(
pypath += testmods + os.pathsep + zipfile
self.set_environ(pythonpath_name, pypath)
- # There are environment variables that we set when we are running the
- # coverage test suite under coverage. We don't want these environment
- # variables to leak into subprocesses we start for a test. Delete them
- # before running the subprocess command.
- self.del_environ("COVERAGE_COVERAGE")
- self.del_environ("COVERAGE_PROCESS_START")
-
self.last_command_status, self.last_command_output = run_command(cmd)
print(self.last_command_output)
return self.last_command_status, self.last_command_output
diff --git a/tests/test_process.py b/tests/test_process.py
index d3f7d56f..4a1e6348 100644
--- a/tests/test_process.py
+++ b/tests/test_process.py
@@ -605,6 +605,9 @@ class ProcessTest(CoverageTest):
def test_warnings_trace_function_changed_with_threads(self):
# https://bitbucket.org/ned/coveragepy/issue/164
+ if env.METACOV:
+ self.skipTest("Can't test tracers changing during metacoverage")
+
self.make_file("bug164.py", """\
import threading
import time