diff options
| -rw-r--r-- | src/flake8/options/config.py | 4 | ||||
| -rw-r--r-- | tests/unit/test_config_file_finder.py | 24 |
2 files changed, 13 insertions, 15 deletions
diff --git a/src/flake8/options/config.py b/src/flake8/options/config.py index 1d18c2e..ec5023b 100644 --- a/src/flake8/options/config.py +++ b/src/flake8/options/config.py @@ -41,9 +41,7 @@ class ConfigFileFinder(object): self.program_name = program_name # List of filenames to find in the local/project directory - self.project_filenames = ( - self.program_config, - ) + self.PROJECT_FILENAMES + self.project_filenames = ('setup.cfg', 'tox.ini', self.program_config) self.local_directory = os.path.abspath(os.curdir) diff --git a/tests/unit/test_config_file_finder.py b/tests/unit/test_config_file_finder.py index 56ff804..2e1a1e5 100644 --- a/tests/unit/test_config_file_finder.py +++ b/tests/unit/test_config_file_finder.py @@ -42,28 +42,28 @@ def test_cli_config(): @pytest.mark.parametrize('args,expected', [ # No arguments, common prefix of abspath('.') ([], - [os.path.abspath('.flake8'), - os.path.abspath('setup.cfg'), - os.path.abspath('tox.ini')]), + [os.path.abspath('setup.cfg'), + os.path.abspath('tox.ini'), + os.path.abspath('.flake8')]), # Common prefix of "flake8/" (['flake8/options', 'flake8/'], - [os.path.abspath('flake8/.flake8'), - os.path.abspath('flake8/setup.cfg'), + [os.path.abspath('flake8/setup.cfg'), os.path.abspath('flake8/tox.ini'), - os.path.abspath('.flake8'), + os.path.abspath('flake8/.flake8'), os.path.abspath('setup.cfg'), - os.path.abspath('tox.ini')]), + os.path.abspath('tox.ini'), + os.path.abspath('.flake8')]), # Common prefix of "flake8/options" (['flake8/options', 'flake8/options/sub'], - [os.path.abspath('flake8/options/.flake8'), - os.path.abspath('flake8/options/setup.cfg'), + [os.path.abspath('flake8/options/setup.cfg'), os.path.abspath('flake8/options/tox.ini'), - os.path.abspath('flake8/.flake8'), + os.path.abspath('flake8/options/.flake8'), os.path.abspath('flake8/setup.cfg'), os.path.abspath('flake8/tox.ini'), - os.path.abspath('.flake8'), + os.path.abspath('flake8/.flake8'), os.path.abspath('setup.cfg'), - os.path.abspath('tox.ini')]), + os.path.abspath('tox.ini'), + os.path.abspath('.flake8')]), ]) def test_generate_possible_local_files(args, expected): """Verify generation of all possible config paths.""" |