summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2009-12-27 10:39:49 -0500
committerNed Batchelder <ned@nedbatchelder.com>2009-12-27 10:39:49 -0500
commit8a06359bee567f563b561699350731433264f928 (patch)
treeae9079dfd427cf001da0a4679472c72bb5a973e4
parent9befdb656dec3e0370d3288b1c2169d7afec379b (diff)
downloadpython-coveragepy-git-8a06359bee567f563b561699350731433264f928.tar.gz
Simplify and test the default pragma exclusion.
-rw-r--r--coverage/config.py4
-rw-r--r--test/test_coverage.py12
2 files changed, 14 insertions, 2 deletions
diff --git a/coverage/config.py b/coverage/config.py
index 0febb36c..20cbc041 100644
--- a/coverage/config.py
+++ b/coverage/config.py
@@ -18,7 +18,7 @@ class CoverageConfig(object):
self.cover_pylib = False
self.timid = False
self.branch = False
- self.exclude_list = ['# *pragma[: ]*[nN][oO] *[cC][oO][vV][eE][rR]']
+ self.exclude_list = ['(?i)# *pragma[: ]*no *cover']
self.data_file = ".coverage"
def from_environment(self, env_var):
@@ -37,7 +37,7 @@ class CoverageConfig(object):
setattr(self, k, v)
def from_file(self, *files):
- """Read configurating from .rc files.
+ """Read configuration from .rc files.
Each argument in `files` is a file name to read.
diff --git a/test/test_coverage.py b/test/test_coverage.py
index c3a88d71..7b4a41ce 100644
--- a/test/test_coverage.py
+++ b/test/test_coverage.py
@@ -1118,6 +1118,18 @@ class CompoundStatementTest(CoverageTest):
class ExcludeTest(CoverageTest):
"""Tests of the exclusion feature to mark lines as not covered."""
+ def testDefault(self):
+ # A number of forms of pragma comment are accepted.
+ self.check_coverage("""\
+ a = 1
+ b = 2 # pragma: no cover
+ c = 3
+ d = 4 #pragma NOCOVER
+ e = 5
+ """,
+ [1,3,5]
+ )
+
def testSimple(self):
self.check_coverage("""\
a = 1; b = 2