pre-commit/flake8
1
0
Fork 0
mirror of https://github.com/PyCQA/flake8.git synced 2026-04-14 08:24:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add tests for generate_possible_local_config_files

Browse source 
Fix a bug found via testing where we traverse all the way to the root
directory looking for config files.
This commit is contained in:
Ian Cordasco 2016-01-10 08:40:35 -06:00
parent dd46f02b58
commit 949d3e48fe
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
flake8/options/config.py
View file

@ -43,7 +43,7 @@ class ConfigFileFinder(object):
# List of filenames to find in the local/project directory # List of filenames to find in the local/project directory
self.project_filenames = ('setup.cfg', 'tox.ini', self.program_config) self.project_filenames = ('setup.cfg', 'tox.ini', self.program_config)
self.local_directory = os.curdir self.local_directory = os.path.abspath(os.curdir)
if not args: if not args:
args = ['.'] args = ['.']
@ -66,11 +66,14 @@ class ConfigFileFinder(object):
"""Find and generate all local config files.""" """Find and generate all local config files."""
tail = self.tail tail = self.tail
parent = self.parent parent = self.parent
local_dir = self.local_directory
while tail: while tail:
for project_filename in self.project_filenames: for project_filename in self.project_filenames:
filename = os.path.abspath(os.path.join(parent, filename = os.path.abspath(os.path.join(parent,
project_filename)) project_filename))
yield filename yield filename
if parent == local_dir:
break
(parent, tail) = os.path.split(parent) (parent, tail) = os.path.split(parent)
def local_config_files(self): def local_config_files(self):

23
tests/unit/test_config_file_finder.py
View file

@ -3,6 +3,7 @@ import os
import sys import sys
import mock import mock
import pytest
from flake8.options import config from flake8.options import config
@ -21,8 +22,30 @@ def test_windows_detection():
def test_cli_config(): def test_cli_config():
"""Verify opening and reading the file specified via the cli."""
cli_filepath = 'tests/fixtures/config_files/cli-specified.ini' cli_filepath = 'tests/fixtures/config_files/cli-specified.ini'
finder = config.ConfigFileFinder('flake8', None, []) finder = config.ConfigFileFinder('flake8', None, [])
parsed_config = finder.cli_config(cli_filepath) parsed_config = finder.cli_config(cli_filepath)
assert parsed_config.has_section('flake8') assert parsed_config.has_section('flake8')
@pytest.mark.parametrize('args,expected', [
([], # No arguments
[os.path.abspath('setup.cfg'),
os.path.abspath('tox.ini'),
os.path.abspath('.flake8')]),
(['flake8/options', 'flake8/'], # Common prefix of "flake8/"
[os.path.abspath('flake8/setup.cfg'),
os.path.abspath('flake8/tox.ini'),
os.path.abspath('flake8/.flake8'),
os.path.abspath('setup.cfg'),
os.path.abspath('tox.ini'),
os.path.abspath('.flake8')]),
])
def test_generate_possible_local_config_files(args, expected):
"""Verify generation of all possible config paths."""
finder = config.ConfigFileFinder('flake8', args, [])
assert (list(finder.generate_possible_local_config_files()) ==
expected)