summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2014-11-01 11:23:57 -0400
committerNed Batchelder <ned@nedbatchelder.com>2014-11-01 11:23:57 -0400
commitd1a7c09d300376ab6dbe2d920779e15cdc73fd1c (patch)
tree3ce7dfe80168fb933b92a58d36fc75833d052b98
parent0df6aedabc8eebcc147936aca5dbd11d8c6d0640 (diff)
downloadpython-coveragepy-d1a7c09d300376ab6dbe2d920779e15cdc73fd1c.tar.gz
Make tests work with latest unittest2
unittest2 now requires six. Six installs an importer hook. That hook is run and measured during these tests. Adding the include argument limits the measurement so that six doesn't appear in the results.
-rw-r--r--tests/farm/html/run_omit_1.py2
-rw-r--r--tests/farm/html/run_omit_2.py2
-rw-r--r--tests/farm/html/run_omit_3.py2
-rw-r--r--tests/farm/html/run_omit_4.py2
-rw-r--r--tests/farm/html/run_omit_5.py2
-rw-r--r--tests/farm/html/run_other.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/farm/html/run_omit_1.py b/tests/farm/html/run_omit_1.py
index a5556af..102aeb2 100644
--- a/tests/farm/html/run_omit_1.py
+++ b/tests/farm/html/run_omit_1.py
@@ -1,7 +1,7 @@
def html_it():
"""Run coverage and make an HTML report for main."""
import coverage
- cov = coverage.coverage()
+ cov = coverage.coverage(include=["./*"])
cov.start()
import main # pragma: nested
cov.stop() # pragma: nested
diff --git a/tests/farm/html/run_omit_2.py b/tests/farm/html/run_omit_2.py
index 19f0ebd..a149c51 100644
--- a/tests/farm/html/run_omit_2.py
+++ b/tests/farm/html/run_omit_2.py
@@ -1,7 +1,7 @@
def html_it():
"""Run coverage and make an HTML report for main."""
import coverage
- cov = coverage.coverage()
+ cov = coverage.coverage(include=["./*"])
cov.start()
import main # pragma: nested
cov.stop() # pragma: nested
diff --git a/tests/farm/html/run_omit_3.py b/tests/farm/html/run_omit_3.py
index 87ab8c3..07b38a8 100644
--- a/tests/farm/html/run_omit_3.py
+++ b/tests/farm/html/run_omit_3.py
@@ -1,7 +1,7 @@
def html_it():
"""Run coverage and make an HTML report for main."""
import coverage
- cov = coverage.coverage()
+ cov = coverage.coverage(include=["./*"])
cov.start()
import main # pragma: nested
cov.stop() # pragma: nested
diff --git a/tests/farm/html/run_omit_4.py b/tests/farm/html/run_omit_4.py
index ede223f..8c0c789 100644
--- a/tests/farm/html/run_omit_4.py
+++ b/tests/farm/html/run_omit_4.py
@@ -1,7 +1,7 @@
def html_it():
"""Run coverage and make an HTML report for main."""
import coverage
- cov = coverage.coverage(config_file="omit4.ini")
+ cov = coverage.coverage(config_file="omit4.ini", include=["./*"])
cov.start()
import main # pragma: nested
cov.stop() # pragma: nested
diff --git a/tests/farm/html/run_omit_5.py b/tests/farm/html/run_omit_5.py
index 8da5199..4ba5e50 100644
--- a/tests/farm/html/run_omit_5.py
+++ b/tests/farm/html/run_omit_5.py
@@ -1,7 +1,7 @@
def html_it():
"""Run coverage and make an HTML report for main."""
import coverage
- cov = coverage.coverage(config_file="omit5.ini")
+ cov = coverage.coverage(config_file="omit5.ini", include=["./*"])
cov.start()
import main # pragma: nested
cov.stop() # pragma: nested
diff --git a/tests/farm/html/run_other.py b/tests/farm/html/run_other.py
index 72bb3ec..23ce29f 100644
--- a/tests/farm/html/run_other.py
+++ b/tests/farm/html/run_other.py
@@ -1,7 +1,7 @@
def html_it():
"""Run coverage and make an HTML report for everything."""
import coverage
- cov = coverage.coverage()
+ cov = coverage.coverage(include=["./*", "../othersrc/*"])
cov.start()
import here # pragma: nested
cov.stop() # pragma: nested