diff options
| author | Eric N. Vander Weele <ericvw@gmail.com> | 2020-01-01 23:38:51 -0500 |
|---|---|---|
| committer | Eric N. Vander Weele <ericvw@gmail.com> | 2020-01-06 22:23:12 -0500 |
| commit | 1a4060cd5f5d3d2f638d01f563e3c42aeb89a135 (patch) | |
| tree | 5c5fcf83437bef3a5ffed54f86516693a8ccae99 /tests | |
| parent | 20906d43046096c31dfcd9b8bc536dbd21f043ef (diff) | |
| download | flake8-1a4060cd5f5d3d2f638d01f563e3c42aeb89a135.tar.gz | |
config: Change ConfigFileFinder._read_config() to accept variadic args
This simplifies `._read_config()` by removing a conditional branch in
the situation where it is called with one file to process. Now the
contract accepts any number of arguments of the same type.
Where callers invoke `._read_config()` with a `Sequence`, the call site
has been changed to unpack arguments (i.e., `*`).
The tests in `test_merged_config_parser.py` needed to return a string
for the user configuration path instead of an empty list since
`ConfigFileFinder.user_config_file()` returns a string.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/test_config_file_finder.py | 2 | ||||
| -rw-r--r-- | tests/unit/test_merged_config_parser.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/unit/test_config_file_finder.py b/tests/unit/test_config_file_finder.py index 1c8330f..b562c4a 100644 --- a/tests/unit/test_config_file_finder.py +++ b/tests/unit/test_config_file_finder.py @@ -113,7 +113,7 @@ def test_local_configs_double_read(): ]) def test_read_config_catches_broken_config_files(files): """Verify that we do not allow the exception to bubble up.""" - _, parsed = config.ConfigFileFinder._read_config(files) + _, parsed = config.ConfigFileFinder._read_config(*files) assert BROKEN_CONFIG_PATH not in parsed diff --git a/tests/unit/test_merged_config_parser.py b/tests/unit/test_merged_config_parser.py index 77b1ba0..a28a4c3 100644 --- a/tests/unit/test_merged_config_parser.py +++ b/tests/unit/test_merged_config_parser.py @@ -183,7 +183,7 @@ def test_parsed_configs_are_equivalent( localcfs.return_value = [config_fixture_path] with mock.patch.object(config_finder, 'user_config_file') as usercf: - usercf.return_value = [] + usercf.return_value = '' parsed_config = parser.merge_user_and_local_config() assert parsed_config['ignore'] == ['E123', 'W234', 'E111'] @@ -215,7 +215,7 @@ def test_parsed_hyphenated_and_underscored_names( localcfs.return_value = [config_file] with mock.patch.object(config_finder, 'user_config_file') as usercf: - usercf.return_value = [] + usercf.return_value = '' parsed_config = parser.merge_user_and_local_config() assert parsed_config['max_line_length'] == 110 |