Fixed some tests

Author: AWhetter

pylint/checkers/__init__.py

@@ -114,7 +114,7 @@ def initialize(registry):
     """Register the checkers in this package.
 
     :param registry: The registry to register checkers with.
-    :type registry: CheckerRegistry
+    :type registry: PluginRegistry
     """
     register_plugins(registry, __path__[0])
 

pylint/config.py

@@ -245,6 +245,9 @@ def add_option(self, option_definition):
             raise exceptions.ConfigurationError('Option "{0}" already exists.')
 
         self._option_definitions[name] = definition
+        if 'default' in definition:
+            dest = definition.get('dest', name)
+            self.set_option(dest, definition['default'])
 
     def add_options(self, option_definitions):
         for option_definition in option_definitions:

pylint/lint.py

@@ -866,45 +866,6 @@ def report_messages_by_module_stats(sect, stats, _):
 # utilities ###################################################################
 
 
-class ArgumentPreprocessingError(Exception):
-    """Raised if an error occurs during argument preprocessing."""
-
-
-def preprocess_options(args, search_for):
-    """look for some options (keys of <search_for>) which have to be processed
-    before others
-
-    values of <search_for> are callback functions to call when the option is
-    found
-    """
-    i = 0
-    while i < len(args):
-        arg = args[i]
-        if arg.startswith('--'):
-            try:
-                option, val = arg[2:].split('=', 1)
-            except ValueError:
-                option, val = arg[2:], None
-            try:
-                cb, takearg = search_for[option]
-            except KeyError:
-                i += 1
-            else:
-                del args[i]
-                if takearg and val is None:
-                    if i >= len(args) or args[i].startswith('-'):
-                        msg = 'Option %s expects a value' % option
-                        raise ArgumentPreprocessingError(msg)
-                    val = args[i]
-                    del args[i]
-                elif not takearg and val is not None:
-                    msg = "Option %s doesn't expects a value" % option
-                    raise ArgumentPreprocessingError(msg)
-                cb(option, val)
-        else:
-            i += 1
-
-
 @contextlib.contextmanager
 def fix_import_path(args):
     """Prepare sys.path for running the linter checks.
@@ -948,12 +909,12 @@ def guess_lint_path(args):
     return value
 
 
-class CheckerRegistry(object):
+class PluginRegistry(object):
     """A class to register checkers to."""
 
-    def __init__(self, linter):
-        super(CheckerRegistry, self).__init__()
-        self.register_options = lambda options: None
+    def __init__(self, linter, register_options=(lambda options: None)):
+        super(PluginRegistry, self).__init__()
+        self.register_options = register_options
         self._checkers = collections.defaultdict(list)
         # TODO: Remove. This is needed for the MessagesHandlerMixIn for now.
         linter._checkers = self._checkers
@@ -1103,7 +1064,7 @@ class CLIRunner(Runner):
     def __init__(self):
         super(CLIRunner, self).__init__()
         self._linter = PyLinter()
-        self._checker_registry = CheckerRegistry(self._linter)
+        self._plugin_registry = PluginRegistry(self._linter)
         self._loaded_plugins = set()
 
     def run(self, args):
@@ -1168,9 +1129,9 @@ def register_options(options):
             global_config.add_options(options)
             parser.add_option_definitions(options)
             file_parser.add_option_definitions(options)
-        self._checker_registry.register_options = register_options
+        self._plugin_registry.register_options = register_options
 
-        checkers.initialize(self._checker_registry)
+        checkers.initialize(self._plugin_registry)
 
         # Load plugins from CLI
         plugins = parsed.load_plugins or []
@@ -1225,7 +1186,7 @@ def register_options(options):
         self._linter.disable('I')
         self._linter.enable('c-extension-no-member')
 
-        for checker in self._checker_registry.for_all_checkers():
+        for checker in self._plugin_registry.for_all_checkers():
             checker.config = global_config
 
         with fix_import_path(global_config.module_or_package):
@@ -1242,7 +1203,7 @@ def load_plugin(self, module_name):
             warnings.warn(msg)
         else:
             module = astroid.modutils.load_module_from_name(module_name)
-            module.register(self._checker_registry)
+            module.register(self._plugin_registry)
 
     def load_plugins(self, module_names):
         """Load a plugin.

pylint/test/test_functional.py

@@ -29,6 +29,7 @@
 from pylint import interfaces
 from pylint import lint
 from pylint import reporters
+import pylint.config
 
 class test_dialect(csv.excel):
     if sys.version_info[0] < 3:
@@ -231,15 +232,17 @@ class LintModuleTest(object):
     def __init__(self, test_file):
         test_reporter = FunctionalTestReporter()
         self._linter = lint.PyLinter()
+        global_config = pylint.config.Configuration()
+        self._linter.config = global_config
+        global_config.add_options(self._linter.options)
+        registry = lint.PluginRegistry(self._linter)
+        file_parser = pylint.config.IniFileParser()
+        file_parser.add_option_definitions(self._linter.options)
         self._linter.set_reporter(test_reporter)
         self._linter.config.persistent = 0
-        checkers.initialize(self._linter)
+        checkers.initialize(registry)
         self._linter.disable('I')
-        try:
-            self._linter.read_config_file(test_file.option_file)
-            self._linter.load_config_file()
-        except NoFileError:
-            pass
+        file_parser.parse(test_file.option_file, global_config)
         self._test_file = test_file
 
     def setUp(self):

pylint/test/test_self.py

@@ -27,7 +27,7 @@
 
 import six
 
-from pylint.lint import Run
+from pylint.lint import CLIRunner
 from pylint.reporters import BaseReporter
 from pylint.reporters.text import *
 from pylint.reporters.json import JSONReporter
@@ -115,7 +115,8 @@ def _run_pylint(self, args, out, reporter=None):
             with pytest.raises(SystemExit) as cm:
                 with warnings.catch_warnings():
                     warnings.simplefilter("ignore")
-                    Run(args, reporter=reporter)
+                    runner = CLIRunner()
+                    runner.run(args)
             return cm.value.code
 
     def _test_output(self, args, expected_output):
@@ -210,10 +211,12 @@ def test_no_out_encoding(self):
                        '--enable=all'],
                       out=strio, code=28)
 
+    @pytest.mark.xfail(reason='Removed parallel execution for now')
     def test_parallel_execution(self):
         self._runtest(['-j 2', 'pylint/test/functional/arguments.py',
                        'pylint/test/functional/bad_continuation.py'], code=1)
 
+    @pytest.mark.xfail(reason='Removed parallel execution for now')
     def test_parallel_execution_missing_arguments(self):
         self._runtest(['-j 2', 'not_here', 'not_here_too'], code=1)
 

pylint/test/unittest_config.py

@@ -16,38 +16,38 @@
 import pytest
 
 def test__regexp_validator_valid():
-    result = config._regexp_validator(None, None, "test_.*")
+    result = config.VALIDATORS['regex']("test_.*")
     assert isinstance(result, re._pattern_type)
     assert result.pattern == "test_.*"
 
 def test__regexp_validator_invalid():
     with pytest.raises(sre_constants.error):
-        config._regexp_validator(None, None, "test_)")
+        config.VALIDATORS['regex']("test_)")
 
 def test__csv_validator_no_spaces():
     values = ["One", "Two", "Three"]
-    result = config._csv_validator(None, None, ",".join(values))
+    result = config.VALIDATORS['csv'](",".join(values))
     assert isinstance(result, list)
     assert len(result) == 3
     for i, value in enumerate(values):
         assert result[i] == value
 
 def test__csv_validator_spaces():
     values = ["One", "Two", "Three"]
-    result = config._csv_validator(None, None, ", ".join(values))
+    result = config.VALIDATORS['csv'](", ".join(values))
     assert isinstance(result, list)
     assert len(result) == 3
     for i, value in enumerate(values):
         assert result[i] == value
 
 def test__regexp_csv_validator_valid():
     pattern_strings = ["test_.*", "foo\\.bar", "^baz$"]
-    result = config._regexp_csv_validator(None, None, ",".join(pattern_strings))
+    result = config.VALIDATORS['regexp_csv'](",".join(pattern_strings))
     for i, regex in enumerate(result):
         assert isinstance(regex, re._pattern_type)
         assert regex.pattern == pattern_strings[i]
 
 def test__regexp_csv_validator_invalid():
     pattern_strings = ["test_.*", "foo\\.bar", "^baz)$"]
     with pytest.raises(sre_constants.error):
-        config._regexp_csv_validator(None, None, ",".join(pattern_strings))
+        config.VALIDATORS['regexp_csv'](",".join(pattern_strings))

pylint/test/unittest_lint.py

@@ -33,7 +33,7 @@
 from six.moves import reload_module
 
 from pylint import config, lint
-from pylint.lint import PyLinter, Run, preprocess_options, ArgumentPreprocessingError
+from pylint.lint import CLIRunner, PluginRegistry, PyLinter
 from pylint.utils import MSG_STATE_SCOPE_CONFIG, MSG_STATE_SCOPE_MODULE, MSG_STATE_CONFIDENCE, \
     MessagesStore, MessageDefinition, FileState, tokenize_module
 from pylint.exceptions import InvalidMessageError, UnknownMessageError
@@ -488,10 +488,11 @@ def test_addmessage_invalid(linter):
 
 
 def test_init_hooks_called_before_load_plugins():
+    runner = CLIRunner()
     with pytest.raises(RuntimeError):
-        Run(['--load-plugins', 'unexistant', '--init-hook', 'raise RuntimeError'])
+        runner.run(['--load-plugins', 'unexistant', '--init-hook', 'raise RuntimeError'])
     with pytest.raises(RuntimeError):
-        Run(['--init-hook', 'raise RuntimeError', '--load-plugins', 'unexistant'])
+        runner.run(['--init-hook', 'raise RuntimeError', '--load-plugins', 'unexistant'])
 
 
 def test_analyze_explicit_script(linter):
@@ -612,37 +613,6 @@ def test_pylintrc_parentdir_no_package():
                 assert config.find_pylintrc() == expected
 
 
-class TestPreprocessOptions(object):
-    def _callback(self, name, value):
-        self.args.append((name, value))
-
-    def test_value_equal(self):
-        self.args = []
-        preprocess_options(['--foo', '--bar=baz', '--qu=ux'],
-                           {'foo': (self._callback, False),
-                            'qu': (self._callback, True)})
-        assert [('foo', None), ('qu', 'ux')] == self.args
-
-    def test_value_space(self):
-        self.args = []
-        preprocess_options(['--qu', 'ux'],
-                           {'qu': (self._callback, True)})
-        assert [('qu', 'ux')] == self.args
-
-    def test_error_missing_expected_value(self):
-        with pytest.raises(ArgumentPreprocessingError):
-            preprocess_options(['--foo', '--bar', '--qu=ux'],
-                               {'bar': (None, True)})
-        with pytest.raises(ArgumentPreprocessingError):
-            preprocess_options(['--foo', '--bar'],
-                               {'bar': (None, True)})
-
-    def test_error_unexpected_value(self):
-        with pytest.raises(ArgumentPreprocessingError):
-            preprocess_options(['--foo', '--bar=spam', '--qu=ux'],
-                               {'bar': (None, False)})
-
-
 @pytest.fixture
 def store():
     store = MessagesStore()
@@ -744,7 +714,9 @@ def should_analyze_file(self, modname, path, is_argument=False):
     package_dir = os.path.join(HERE, 'regrtest_data', 'bad_package')
     wrong_file = os.path.join(package_dir, 'wrong.py')
     reporter = testutils.TestReporter()
-    linter = CustomPyLinter()
+    global_config = config.Configuration()
+    linter = CustomPyLinter(global_config)
+    registry = PluginRegistry(linter, register_options=global_config.add_options)
     linter.config.persistent = 0
     linter.open()
     linter.set_reporter(reporter)

pylint/test/unittest_reporters_json.py

@@ -13,7 +13,8 @@
 
 import six
 
-from pylint.lint import PyLinter
+import pylint.config
+from pylint.lint import PluginRegistry, PyLinter
 from pylint import checkers
 from pylint.reporters.json import JSONReporter
 
@@ -22,8 +23,11 @@ def test_simple_json_output():
     output = six.StringIO()
 
     reporter = JSONReporter()
-    linter = PyLinter(reporter=reporter)
-    checkers.initialize(linter)
+    global_config = pylint.config.Configuration()
+    linter = PyLinter(global_config)
+    registry = PluginRegistry(linter, register_options=global_config.add_options)
+    checkers.initialize(registry)
+    linter.set_reporter(reporter)
 
     linter.config.persistent = 0
     linter.reporter.set_output(output)

pylint/test/unittest_reporting.py

@@ -13,7 +13,8 @@
 
 import six
 
-from pylint.lint import PyLinter
+import pylint.config
+from pylint.lint import PluginRegistry, PyLinter
 from pylint import checkers
 from pylint.reporters.text import TextReporter, ParseableTextReporter
 import pytest
@@ -55,12 +56,15 @@ def test_parseable_output_deprecated():
 def test_parseable_output_regression():
     output = six.StringIO()
     with warnings.catch_warnings(record=True):
-        linter = PyLinter(reporter=ParseableTextReporter())
+        global_config = pylint.config.Configuration()
+        linter = PyLinter(global_config)
+        registry = PluginRegistry(linter, register_options=global_config.add_options)
+        linter.set_reporter(ParseableTextReporter())
 
-    checkers.initialize(linter)
+    checkers.initialize(registry)
     linter.config.persistent = 0
     linter.reporter.set_output(output)
-    linter.set_option('output-format', 'parseable')
+    linter.config.output_format = 'parseable'
     linter.open()
     linter.set_current_module('0123')
     linter.add_message('line-too-long', line=1, args=(1, 2))

pylint/testutils.py

@@ -35,10 +35,11 @@
 
 import astroid
 from pylint import checkers
+import pylint.config
 from pylint.utils import PyLintASTWalker
 from pylint.reporters import BaseReporter
 from pylint.interfaces import IReporter
-from pylint.lint import PyLinter
+from pylint.lint import PluginRegistry, PyLinter
 
 # Utils
 
@@ -169,6 +170,7 @@ class UnittestLinter(object):
     def __init__(self):
         self._messages = []
         self.stats = {}
+        self.config = pylint.config.Configuration()
 
     def release_messages(self):
         try:
@@ -216,7 +218,9 @@ class CheckerTestCase(object):
 
     def setup_method(self):
         self.linter = UnittestLinter()
-        self.checker = self.CHECKER_CLASS(self.linter) # pylint: disable=not-callable
+        registry = pylint.config.PluginRegistry(self.linter)
+        registry.register_options = self.linter.config.add_options
+        self.checker = self.CHECKER_CLASS(registry) # pylint: disable=not-callable
         for key, value in six.iteritems(self.CONFIG):
             setattr(self.checker.config, key, value)
         self.checker.open()
@@ -251,10 +255,10 @@ def walk(self, node):
 
 # Init
 test_reporter = TestReporter()
-linter = PyLinter()
+linter = PyLinter(pylint.config.Configuration())
 linter.set_reporter(test_reporter)
 linter.config.persistent = 0
-checkers.initialize(linter)
+checkers.initialize(PluginRegistry(linter))
 
 
 def _tokenize_str(code):