summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2016-06-28 20:47:16 -0500
committerIan Cordasco <graffatcolmingov@gmail.com>2016-06-28 20:47:16 -0500
commit75e1c1efbf00af78818a1f69d2b2fa5d5a3ffff9 (patch)
treebe7759cca17f5e92802c938a5fdfce62af8e20c0 /tests
parent15745558c17fa9732c015f0f4e7fd9386519a70c (diff)
downloadflake8-75e1c1efbf00af78818a1f69d2b2fa5d5a3ffff9.tar.gz
Revert "Prefer `.flake8` if present for options."
The intended behaviour already existed. This reverts commit db9d4ad8b4cc2aab1ef8349dc969faa8f589e9cc.
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/test_config_file_finder.py24
1 files changed, 12 insertions, 12 deletions
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."""