summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--metacov.ini1
-rw-r--r--test/coveragetest.py4
-rw-r--r--test/farm/html/run_a.py4
-rw-r--r--test/farm/html/run_a_xml_1.py4
-rw-r--r--test/farm/html/run_a_xml_2.py4
-rw-r--r--test/farm/html/run_b_branch.py4
-rw-r--r--test/farm/html/run_bom.py4
-rw-r--r--test/farm/html/run_isolatin1.py4
-rw-r--r--test/farm/html/run_omit_1.py4
-rw-r--r--test/farm/html/run_omit_2.py4
-rw-r--r--test/farm/html/run_omit_3.py4
-rw-r--r--test/farm/html/run_omit_4.py4
-rw-r--r--test/farm/html/run_omit_5.py4
-rw-r--r--test/farm/html/run_other.py4
-rw-r--r--test/farm/html/run_partial.py4
-rw-r--r--test/farm/html/run_styled.py4
-rw-r--r--test/farm/html/run_tabbed.py4
-rw-r--r--test/farm/html/run_unicode.py4
-rw-r--r--test/farm/html/run_y_xml_branch.py4
-rw-r--r--test/test_api.py12
-rw-r--r--test/test_oddball.py4
-rw-r--r--test/test_summary.py12
22 files changed, 51 insertions, 50 deletions
diff --git a/metacov.ini b/metacov.ini
index 2bbc090b..1336915e 100644
--- a/metacov.ini
+++ b/metacov.ini
@@ -11,6 +11,7 @@ source =
# We set a different pragma so our code won't be confused with test code.
exclude_lines =
# pragma: not covered
+ # pragma: nested
def __repr__
if __name__ == .__main__.:
raise AssertionError
diff --git a/test/coveragetest.py b/test/coveragetest.py
index 7f4ef42c..73284638 100644
--- a/test/coveragetest.py
+++ b/test/coveragetest.py
@@ -222,10 +222,10 @@ class CoverageTest(TestCase):
"""
cov.start()
- try: # pragma: not covered
+ try: # pragma: nested
# Import the python file, executing it.
mod = self.import_local_file(modname)
- finally: # pragma: not covered
+ finally: # pragma: nested
# Stop Coverage.
cov.stop()
return mod
diff --git a/test/farm/html/run_a.py b/test/farm/html/run_a.py
index 047d8982..59cc1703 100644
--- a/test/farm/html/run_a.py
+++ b/test/farm/html/run_a.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage()
cov.start()
- import a
- cov.stop()
+ import a # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(a, directory="../html_a")
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_a_xml_1.py b/test/farm/html/run_a_xml_1.py
index e3aaff2f..3d187023 100644
--- a/test/farm/html/run_a_xml_1.py
+++ b/test/farm/html/run_a_xml_1.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage()
cov.start()
- import a
- cov.stop()
+ import a # pragma: nested
+ cov.stop() # pragma: nested
cov.xml_report(a, outfile="../xml_1/coverage.xml")
import os
diff --git a/test/farm/html/run_a_xml_2.py b/test/farm/html/run_a_xml_2.py
index c9139a19..53691ead 100644
--- a/test/farm/html/run_a_xml_2.py
+++ b/test/farm/html/run_a_xml_2.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage(config_file="run_a_xml_2.ini")
cov.start()
- import a
- cov.stop()
+ import a # pragma: nested
+ cov.stop() # pragma: nested
cov.xml_report(a)
import os
diff --git a/test/farm/html/run_b_branch.py b/test/farm/html/run_b_branch.py
index 761d9662..d0955a2a 100644
--- a/test/farm/html/run_b_branch.py
+++ b/test/farm/html/run_b_branch.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage(branch=True)
cov.start()
- import b
- cov.stop()
+ import b # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(b, directory="../html_b_branch")
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_bom.py b/test/farm/html/run_bom.py
index 918ad784..c35079be 100644
--- a/test/farm/html/run_bom.py
+++ b/test/farm/html/run_bom.py
@@ -5,8 +5,8 @@ def html_it():
import coverage
cov = coverage.coverage()
cov.start()
- import bom
- cov.stop()
+ import bom # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(bom, directory="../html_bom")
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_isolatin1.py b/test/farm/html/run_isolatin1.py
index 9f4b8690..063e6e00 100644
--- a/test/farm/html/run_isolatin1.py
+++ b/test/farm/html/run_isolatin1.py
@@ -5,8 +5,8 @@ def html_it():
import coverage
cov = coverage.coverage()
cov.start()
- import isolatin1
- cov.stop()
+ import isolatin1 # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(isolatin1, directory="../html_isolatin1")
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_omit_1.py b/test/farm/html/run_omit_1.py
index a493a8aa..a5556af2 100644
--- a/test/farm/html/run_omit_1.py
+++ b/test/farm/html/run_omit_1.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage()
cov.start()
- import main
- cov.stop()
+ import main # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(directory="../html_omit_1")
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_omit_2.py b/test/farm/html/run_omit_2.py
index 53256d16..19f0ebdc 100644
--- a/test/farm/html/run_omit_2.py
+++ b/test/farm/html/run_omit_2.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage()
cov.start()
- import main
- cov.stop()
+ import main # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(directory="../html_omit_2", omit=["m1.py"])
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_omit_3.py b/test/farm/html/run_omit_3.py
index 7050cad3..87ab8c32 100644
--- a/test/farm/html/run_omit_3.py
+++ b/test/farm/html/run_omit_3.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage()
cov.start()
- import main
- cov.stop()
+ import main # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(directory="../html_omit_3", omit=["m1.py", "m2.py"])
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_omit_4.py b/test/farm/html/run_omit_4.py
index c62e9d57..ede223f8 100644
--- a/test/farm/html/run_omit_4.py
+++ b/test/farm/html/run_omit_4.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage(config_file="omit4.ini")
cov.start()
- import main
- cov.stop()
+ import main # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(directory="../html_omit_4")
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_omit_5.py b/test/farm/html/run_omit_5.py
index bd0fc9e2..8da51994 100644
--- a/test/farm/html/run_omit_5.py
+++ b/test/farm/html/run_omit_5.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage(config_file="omit5.ini")
cov.start()
- import main
- cov.stop()
+ import main # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report()
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_other.py b/test/farm/html/run_other.py
index e75500cf..72bb3ec1 100644
--- a/test/farm/html/run_other.py
+++ b/test/farm/html/run_other.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage()
cov.start()
- import here
- cov.stop()
+ import here # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(directory="../html_other")
runfunc(html_it, rundir="src", addtopath="../othersrc")
diff --git a/test/farm/html/run_partial.py b/test/farm/html/run_partial.py
index 0ef8589c..41e6ba96 100644
--- a/test/farm/html/run_partial.py
+++ b/test/farm/html/run_partial.py
@@ -5,8 +5,8 @@ def html_it():
import coverage
cov = coverage.coverage(branch=True)
cov.start()
- import partial
- cov.stop()
+ import partial # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(partial, directory="../html_partial")
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_styled.py b/test/farm/html/run_styled.py
index 3a212957..ac538ff5 100644
--- a/test/farm/html/run_styled.py
+++ b/test/farm/html/run_styled.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage()
cov.start()
- import a
- cov.stop()
+ import a # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(a, directory="../html_styled", extra_css="extra.css")
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_tabbed.py b/test/farm/html/run_tabbed.py
index 3076b4e5..0e9b5278 100644
--- a/test/farm/html/run_tabbed.py
+++ b/test/farm/html/run_tabbed.py
@@ -3,8 +3,8 @@ def html_it():
import coverage
cov = coverage.coverage()
cov.start()
- import tabbed
- cov.stop()
+ import tabbed # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(tabbed, directory="../html_tabbed")
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_unicode.py b/test/farm/html/run_unicode.py
index 6ed44660..cef26ee5 100644
--- a/test/farm/html/run_unicode.py
+++ b/test/farm/html/run_unicode.py
@@ -5,8 +5,8 @@ def html_it():
import coverage
cov = coverage.coverage()
cov.start()
- import unicode
- cov.stop()
+ import unicode # pragma: nested
+ cov.stop() # pragma: nested
cov.html_report(unicode, directory="../html_unicode")
runfunc(html_it, rundir="src")
diff --git a/test/farm/html/run_y_xml_branch.py b/test/farm/html/run_y_xml_branch.py
index b0ce8a81..88a2e44e 100644
--- a/test/farm/html/run_y_xml_branch.py
+++ b/test/farm/html/run_y_xml_branch.py
@@ -3,8 +3,8 @@ def xml_it():
import coverage
cov = coverage.coverage(branch=True)
cov.start()
- import y
- cov.stop()
+ import y # pragma: nested
+ cov.stop() # pragma: nested
cov.xml_report(y, outfile="../xml_branch/coverage.xml")
import os
diff --git a/test/test_api.py b/test/test_api.py
index dcd046bc..4c4f7650 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -403,8 +403,8 @@ class SourceOmitIncludeTest(OmitIncludeTestsMixin, CoverageTest):
"""
cov = coverage.coverage(**kwargs)
cov.start()
- import usepkgs # pragma: not covered # pylint: disable=F0401,W0612
- cov.stop() # pragma: not covered
+ import usepkgs # pragma: nested # pylint: disable=F0401,W0612
+ cov.stop() # pragma: nested
cov._harvest_data() # private! sshhh...
summary = cov.data.summary()
for k, v in list(summary.items()):
@@ -432,8 +432,8 @@ class ReportIncludeOmitTest(OmitIncludeTestsMixin, CoverageTest):
"""Try coverage.report()."""
cov = coverage.coverage()
cov.start()
- import usepkgs # pragma: not covered # pylint: disable=F0401,W0612
- cov.stop() # pragma: not covered
+ import usepkgs # pragma: nested # pylint: disable=F0401,W0612
+ cov.stop() # pragma: nested
report = StringIO()
cov.report(file=report, **kwargs)
return report.getvalue()
@@ -451,8 +451,8 @@ class XmlIncludeOmitTest(OmitIncludeTestsMixin, CoverageTest):
"""Try coverage.xml_report()."""
cov = coverage.coverage()
cov.start()
- import usepkgs # pragma: not covered # pylint: disable=F0401,W0612
- cov.stop() # pragma: not covered
+ import usepkgs # pragma: nested # pylint: disable=F0401,W0612
+ cov.stop() # pragma: nested
cov.xml_report(outfile="-", **kwargs)
return self.stdout()
diff --git a/test/test_oddball.py b/test/test_oddball.py
index 14d56b11..75cd00ee 100644
--- a/test/test_oddball.py
+++ b/test/test_oddball.py
@@ -298,8 +298,8 @@ class ExceptionTest(CoverageTest):
cov.start()
# Call our list of functions: invoke the first, with the rest as
# an argument.
- calls[0](calls[1:])
- cov.stop()
+ calls[0](calls[1:]) # pragma: nested
+ cov.stop() # pragma: nested
# Clean the line data and compare to expected results.
# The filenames are absolute, so keep just the base.
diff --git a/test/test_summary.py b/test/test_summary.py
index f3651ed6..0bd40b84 100644
--- a/test/test_summary.py
+++ b/test/test_summary.py
@@ -201,8 +201,8 @@ class SummaryTest(CoverageTest):
""")
cov = coverage.coverage(branch=True, source=["."])
cov.start()
- import main # pragma: not covered # pylint: disable=F0401,W0612
- cov.stop() # pragma: not covered
+ import main # pragma: nested # pylint: disable=F0401,W0612
+ cov.stop() # pragma: nested
report = self.get_report(cov).splitlines()
self.assertIn("mybranch 5 5 2 2 0%", report)
@@ -210,8 +210,8 @@ class SummaryTest(CoverageTest):
"""A helper for the next few tests."""
cov = coverage.coverage()
cov.start()
- import TheCode # pragma: not covered # pylint: disable=F0401,W0612
- cov.stop() # pragma: not covered
+ import TheCode # pragma: nested # pylint: disable=F0401,W0612
+ cov.stop() # pragma: nested
return self.get_report(cov)
def test_bug_203_mixed_case_listed_twice_with_rc(self):
@@ -252,8 +252,8 @@ class SummaryTest2(CoverageTest):
# statements, not one statement.
cov = coverage.coverage()
cov.start()
- import usepkgs # pragma: not covered # pylint: disable=F0401,W0612
- cov.stop() # pragma: not covered
+ import usepkgs # pragma: nested # pylint: disable=F0401,W0612
+ cov.stop() # pragma: nested
repout = StringIO()
cov.report(file=repout, show_missing=False)
View Lorry Controller Status