diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_api.py | 7 | ||||
| -rw-r--r-- | tests/test_config.py | 13 | ||||
| -rw-r--r-- | tests/test_debug.py | 3 |
3 files changed, 18 insertions, 5 deletions
diff --git a/tests/test_api.py b/tests/test_api.py index 56184586..8beb630d 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -579,6 +579,13 @@ class SourceOmitIncludeTest(OmitIncludeTestsMixin, CoverageTest): summary[k[:-3]] = v return summary + def test_source_include_exclusive(self): + lines = self.coverage_usepkgs(source=["pkg1"], include=["pkg2"]) + self.filenames_in(lines, "p1a p1b") + self.filenames_not_in(lines, "p2a p2b othera otherb osa osb") + out = self.stdout() + self.assertIn("--include is ignored", out) + def test_source_package_as_dir(self): # pkg1 is a directory, since we cd'd into tests/modules in setUp. lines = self.coverage_usepkgs(source=["pkg1"]) diff --git a/tests/test_config.py b/tests/test_config.py index a97a436f..a9c74aa0 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -264,6 +264,8 @@ class ConfigFileTest(UsingModulesMixin, CoverageTest): cover_pylib = TRUE parallel = on concurrency = thread + ; this omit is overriden by the omit from [report] + omit = twenty source = myapp plugins = plugins.a_plugin @@ -283,6 +285,7 @@ class ConfigFileTest(UsingModulesMixin, CoverageTest): omit = one, another, some_more, yet_more + include = thirty precision = 3 partial_branches = @@ -354,7 +357,9 @@ class ConfigFileTest(UsingModulesMixin, CoverageTest): self.assertEqual(cov.get_exclude_list(), ["if 0:", r"pragma:?\s+no cover", "another_tab"]) self.assertTrue(cov.config.ignore_errors) - self.assertEqual(cov.config.omit, ["one", "another", "some_more", "yet_more"]) + self.assertEqual(cov.config.run_omit, cov.config.report_omit) + self.assertEqual(cov.config.report_omit, ["one", "another", "some_more", "yet_more"]) + self.assertEqual(cov.config.report_include, ["thirty"]) self.assertEqual(cov.config.precision, 3) self.assertEqual(cov.config.partial_list, [r"pragma:?\s+no branch"]) @@ -423,8 +428,8 @@ class ConfigFileTest(UsingModulesMixin, CoverageTest): branch = true """) cov = coverage.Coverage() - self.assertEqual(cov.config.include, ["foo"]) - self.assertEqual(cov.config.omit, None) + self.assertEqual(cov.config.run_include, ["foo"]) + self.assertEqual(cov.config.run_omit, None) self.assertEqual(cov.config.branch, False) def test_setupcfg_only_if_not_coveragerc(self): @@ -441,7 +446,7 @@ class ConfigFileTest(UsingModulesMixin, CoverageTest): branch = true """) cov = coverage.Coverage() - self.assertEqual(cov.config.omit, None) + self.assertEqual(cov.config.run_omit, None) self.assertEqual(cov.config.branch, False) def test_setupcfg_only_if_prefixed(self): diff --git a/tests/test_debug.py b/tests/test_debug.py index f733d723..38f31f58 100644 --- a/tests/test_debug.py +++ b/tests/test_debug.py @@ -147,8 +147,9 @@ class DebugTraceTest(CoverageTest): labels = """ attempted_config_files branch config_files cover_pylib data_file debug exclude_list extra_css html_dir html_title ignore_errors - include omit parallel partial_always_list partial_list paths + run_include run_omit parallel partial_always_list partial_list paths precision show_missing source timid xml_output + report_include report_omit """.split() for label in labels: label_pat = r"^\s*%s: " % label |