diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2011-06-01 08:19:46 -0400 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2011-06-01 08:19:46 -0400 |
commit | 8bcc7a31b38ea0ddd2b139834d8860e681658008 (patch) | |
tree | 5dc30d415c8b11c4e95b1eac2e04989fc9df1b13 | |
parent | 436f9067dd78373555b6ab12db9c20406467eabb (diff) | |
download | python-coveragepy-8bcc7a31b38ea0ddd2b139834d8860e681658008.tar.gz |
Move some test modules to keep them out of pylint's hair.
-rw-r--r-- | coverage/config.py | 9 | ||||
-rw-r--r-- | test/moremodules/othermods/__init__.py (renamed from test/othermods/__init__.py) | 0 | ||||
-rw-r--r-- | test/moremodules/othermods/othera.py (renamed from test/othermods/othera.py) | 0 | ||||
-rw-r--r-- | test/moremodules/othermods/otherb.py (renamed from test/othermods/otherb.py) | 0 | ||||
-rw-r--r-- | test/moremodules/othermods/sub/__init__.py (renamed from test/othermods/sub/__init__.py) | 0 | ||||
-rw-r--r-- | test/moremodules/othermods/sub/osa.py (renamed from test/othermods/sub/osa.py) | 0 | ||||
-rw-r--r-- | test/moremodules/othermods/sub/osb.py (renamed from test/othermods/sub/osb.py) | 0 | ||||
-rw-r--r-- | test/test_api.py | 2 | ||||
-rw-r--r-- | test/test_summary.py | 1 |
9 files changed, 8 insertions, 4 deletions
diff --git a/coverage/config.py b/coverage/config.py index f842964..6b441dd 100644 --- a/coverage/config.py +++ b/coverage/config.py @@ -99,7 +99,8 @@ class CoverageConfig(object): # [report] if cp.has_option('report', 'exclude_lines'): - self.exclude_list = self.get_line_list(cp, 'report', 'exclude_lines') + self.exclude_list = \ + self.get_line_list(cp, 'report', 'exclude_lines') if cp.has_option('report', 'ignore_errors'): self.ignore_errors = cp.getboolean('report', 'ignore_errors') if cp.has_option('report', 'include'): @@ -107,9 +108,11 @@ class CoverageConfig(object): if cp.has_option('report', 'omit'): self.omit = self.get_list(cp, 'report', 'omit') if cp.has_option('report', 'partial_branches'): - self.partial_list = self.get_line_list(cp, 'report', 'partial_branches') + self.partial_list = \ + self.get_line_list(cp, 'report', 'partial_branches') if cp.has_option('report', 'partial_branches_always'): - self.partial_always_list = self.get_line_list(cp, 'report', 'partial_branches_always') + self.partial_always_list = \ + self.get_line_list(cp, 'report', 'partial_branches_always') if cp.has_option('report', 'precision'): self.precision = cp.getint('report', 'precision') diff --git a/test/othermods/__init__.py b/test/moremodules/othermods/__init__.py index e69de29..e69de29 100644 --- a/test/othermods/__init__.py +++ b/test/moremodules/othermods/__init__.py diff --git a/test/othermods/othera.py b/test/moremodules/othermods/othera.py index 7889692..7889692 100644 --- a/test/othermods/othera.py +++ b/test/moremodules/othermods/othera.py diff --git a/test/othermods/otherb.py b/test/moremodules/othermods/otherb.py index 2bd8a44..2bd8a44 100644 --- a/test/othermods/otherb.py +++ b/test/moremodules/othermods/otherb.py diff --git a/test/othermods/sub/__init__.py b/test/moremodules/othermods/sub/__init__.py index e69de29..e69de29 100644 --- a/test/othermods/sub/__init__.py +++ b/test/moremodules/othermods/sub/__init__.py diff --git a/test/othermods/sub/osa.py b/test/moremodules/othermods/sub/osa.py index 0139d28..0139d28 100644 --- a/test/othermods/sub/osa.py +++ b/test/moremodules/othermods/sub/osa.py diff --git a/test/othermods/sub/osb.py b/test/moremodules/othermods/sub/osb.py index b024b14..b024b14 100644 --- a/test/othermods/sub/osb.py +++ b/test/moremodules/othermods/sub/osb.py diff --git a/test/test_api.py b/test/test_api.py index ae31404..1805c39 100644 --- a/test/test_api.py +++ b/test/test_api.py @@ -337,10 +337,10 @@ class SourceOmitIncludeTest(CoverageTest): def setUp(self): super(SourceOmitIncludeTest, self).setUp() # Parent class saves and restores sys.path, we can just modify it. - #sys.path.append(self.nice_file(os.path.dirname(__file__), 'modules')) self.old_dir = os.getcwd() os.chdir(self.nice_file(os.path.dirname(__file__), 'modules')) sys.path.append(".") + sys.path.append("../moremodules") def tearDown(self): os.chdir(self.old_dir) diff --git a/test/test_summary.py b/test/test_summary.py index b4b9938..306ce88 100644 --- a/test/test_summary.py +++ b/test/test_summary.py @@ -139,6 +139,7 @@ class SummaryTest2(CoverageTest): super(SummaryTest2, self).setUp() # Parent class saves and restores sys.path, we can just modify it. sys.path.append(self.nice_file(os.path.dirname(__file__), 'modules')) + sys.path.append(self.nice_file(os.path.dirname(__file__), 'moremodules')) def test_empty_files(self): # Shows that empty files like __init__.py are listed as having zero |