summaryrefslogtreecommitdiff
path: root/tests/integration
diff options
context:
space:
mode:
authorAnthony Sottile <asottile@umich.edu>2020-01-13 05:31:57 +0000
committerAnthony Sottile <asottile@umich.edu>2020-01-13 05:31:57 +0000
commitb56c88fe654af09161a66bf81e00481fa5d2d8c5 (patch)
treeb78f9607faac7419731829536970f402b7405ce2 /tests/integration
parent44d67e46f5ebe6bc458fe7b18a7b8821e7b2391e (diff)
parenteb6698c420bc62e4069377f8112c96893d30dd85 (diff)
downloadflake8-b56c88fe654af09161a66bf81e00481fa5d2d8c5.tar.gz
Merge branch 'config-finder-extra-files-optional' into 'master'
config: Make ConfigFileFinder 'extra_config_files' parameter optional See merge request pycqa/flake8!402
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/test_aggregator.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/integration/test_aggregator.py b/tests/integration/test_aggregator.py
index 16ed59b..2bdea70 100644
--- a/tests/integration/test_aggregator.py
+++ b/tests/integration/test_aggregator.py
@@ -32,7 +32,6 @@ def test_aggregate_options_with_config(optmanager):
'E11,E34,E402,W,F', '--exclude', 'tests/*']
config_finder = config.ConfigFileFinder(
'flake8',
- [],
config_file=CLI_SPECIFIED_CONFIG)
options, args = aggregator.aggregate_options(
optmanager, config_finder, arguments)
@@ -47,7 +46,7 @@ def test_aggregate_options_when_isolated(optmanager):
arguments = ['flake8', '--select', 'E11,E34,E402,W,F',
'--exclude', 'tests/*']
config_finder = config.ConfigFileFinder(
- 'flake8', [], ignore_config_files=True)
+ 'flake8', ignore_config_files=True)
optmanager.extend_default_ignore(['E8'])
options, args = aggregator.aggregate_options(
optmanager, config_finder, arguments)