Remove hastiliy short-circuited check for conflicting include and source

2 files changed, 0 insertions, 17 deletions

diff --git a/coverage/config.py b/coverage/config.py
index bec7e7a..3dd6ea9 100644
--- a/coverage/config.py
+++ b/coverage/config.py
@@ -382,14 +382,6 @@ class CoverageConfig(object):
         # If we get here, we didn't find the option.
         raise CoverageException("No such option: %r" % option_name)
 
-    def sanity_check(self):
-        """Check interactions among settings, and raise if there's a problem."""
-        return
-        # TODO: This check was too simple, and broke a few things:
-        # https://bitbucket.org/ned/coveragepy/issues/541/coverage-43-breaks-nosetest-with-coverage
-        if (self.source is not None) and (self.include is not None):
-            raise CoverageException("--include and --source are mutually exclusive")
-
 
 def read_coverage_config(config_file, **kwargs):
     """Read the coverage.py configuration.
@@ -446,6 +438,4 @@ def read_coverage_config(config_file, **kwargs):
     # 4) from constructor arguments:
     config.from_args(**kwargs)
 
-    config.sanity_check()
-
     return config_file, config
diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py
index cbb1d13..01b0bbc 100644
--- a/tests/test_cmdline.py
+++ b/tests/test_cmdline.py
@@ -459,13 +459,6 @@ class CmdLineTest(BaseCmdLineTest):
             .save()
             """)
 
-    def test_bad_run_args_with_both_source_and_include(self):
-        return
-        # TODO: This check was too simple, and broke a few things:
-        # https://bitbucket.org/ned/coveragepy/issues/541/coverage-43-breaks-nosetest-with-coverage
-        with self.assertRaisesRegex(CoverageException, 'mutually exclusive'):
-            self.command_line("run --include=pre1,pre2 --source=lol,wut foo.py", ret=ERR)
-
     def test_bad_concurrency(self):
         self.command_line("run --concurrency=nothing", ret=ERR)
         out = self.stdout()