From 8bcc7a31b38ea0ddd2b139834d8860e681658008 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Wed, 1 Jun 2011 08:19:46 -0400 Subject: Move some test modules to keep them out of pylint's hair. --- coverage/config.py | 9 ++++++--- test/moremodules/othermods/__init__.py | 0 test/moremodules/othermods/othera.py | 2 ++ test/moremodules/othermods/otherb.py | 2 ++ test/moremodules/othermods/sub/__init__.py | 0 test/moremodules/othermods/sub/osa.py | 2 ++ test/moremodules/othermods/sub/osb.py | 2 ++ test/othermods/__init__.py | 0 test/othermods/othera.py | 2 -- test/othermods/otherb.py | 2 -- test/othermods/sub/__init__.py | 0 test/othermods/sub/osa.py | 2 -- test/othermods/sub/osb.py | 2 -- test/test_api.py | 2 +- test/test_summary.py | 1 + 15 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 test/moremodules/othermods/__init__.py create mode 100644 test/moremodules/othermods/othera.py create mode 100644 test/moremodules/othermods/otherb.py create mode 100644 test/moremodules/othermods/sub/__init__.py create mode 100644 test/moremodules/othermods/sub/osa.py create mode 100644 test/moremodules/othermods/sub/osb.py delete mode 100644 test/othermods/__init__.py delete mode 100644 test/othermods/othera.py delete mode 100644 test/othermods/otherb.py delete mode 100644 test/othermods/sub/__init__.py delete mode 100644 test/othermods/sub/osa.py delete mode 100644 test/othermods/sub/osb.py 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/moremodules/othermods/__init__.py b/test/moremodules/othermods/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/test/moremodules/othermods/othera.py b/test/moremodules/othermods/othera.py new file mode 100644 index 0000000..7889692 --- /dev/null +++ b/test/moremodules/othermods/othera.py @@ -0,0 +1,2 @@ +o = 1 +p = 2 diff --git a/test/moremodules/othermods/otherb.py b/test/moremodules/othermods/otherb.py new file mode 100644 index 0000000..2bd8a44 --- /dev/null +++ b/test/moremodules/othermods/otherb.py @@ -0,0 +1,2 @@ +q = 3 +r = 4 diff --git a/test/moremodules/othermods/sub/__init__.py b/test/moremodules/othermods/sub/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/test/moremodules/othermods/sub/osa.py b/test/moremodules/othermods/sub/osa.py new file mode 100644 index 0000000..0139d28 --- /dev/null +++ b/test/moremodules/othermods/sub/osa.py @@ -0,0 +1,2 @@ +s = 5 +t = 6 diff --git a/test/moremodules/othermods/sub/osb.py b/test/moremodules/othermods/sub/osb.py new file mode 100644 index 0000000..b024b14 --- /dev/null +++ b/test/moremodules/othermods/sub/osb.py @@ -0,0 +1,2 @@ +u = 7 +v = 8 diff --git a/test/othermods/__init__.py b/test/othermods/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/test/othermods/othera.py b/test/othermods/othera.py deleted file mode 100644 index 7889692..0000000 --- a/test/othermods/othera.py +++ /dev/null @@ -1,2 +0,0 @@ -o = 1 -p = 2 diff --git a/test/othermods/otherb.py b/test/othermods/otherb.py deleted file mode 100644 index 2bd8a44..0000000 --- a/test/othermods/otherb.py +++ /dev/null @@ -1,2 +0,0 @@ -q = 3 -r = 4 diff --git a/test/othermods/sub/__init__.py b/test/othermods/sub/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/test/othermods/sub/osa.py b/test/othermods/sub/osa.py deleted file mode 100644 index 0139d28..0000000 --- a/test/othermods/sub/osa.py +++ /dev/null @@ -1,2 +0,0 @@ -s = 5 -t = 6 diff --git a/test/othermods/sub/osb.py b/test/othermods/sub/osb.py deleted file mode 100644 index b024b14..0000000 --- a/test/othermods/sub/osb.py +++ /dev/null @@ -1,2 +0,0 @@ -u = 7 -v = 8 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 -- cgit v1.2.1