summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2017-05-28 01:41:13 +0000
committerIan Cordasco <graffatcolmingov@gmail.com>2017-05-28 01:41:13 +0000
commitfec980a856587b9cd1be0b0dd01ffcb5e3a3418f (patch)
tree3c83513d7dc133f25c6a5c7ea870eff35ee85134 /tests
parentec5405d2a8287022fd50f456385e2eaefa663c3e (diff)
parentaefa79535f985bd19c375332abea6f3712815a0a (diff)
downloadflake8-fec980a856587b9cd1be0b0dd01ffcb5e3a3418f.tar.gz
Merge branch 'bug/318' into 'master'
Further improve our handling of --select and --ignore Closes #318 See merge request !187
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/test_style_guide.py21
1 files changed, 20 insertions, 1 deletions
diff --git a/tests/unit/test_style_guide.py b/tests/unit/test_style_guide.py
index 7357b25..5c24048 100644
--- a/tests/unit/test_style_guide.py
+++ b/tests/unit/test_style_guide.py
@@ -125,6 +125,13 @@ def test_is_user_selected_excludes_errors(select_list, error_code):
(['E41'], ['E2', 'E12', 'E4'], 'E410', style_guide.Decision.Selected),
(['E'], ['F'], 'E410', style_guide.Decision.Selected),
(['F'], [], 'E410', style_guide.Decision.Ignored),
+ (['E'], defaults.IGNORE, 'E126', style_guide.Decision.Selected),
+ (['W'], defaults.IGNORE, 'E126', style_guide.Decision.Ignored),
+ (['E'], defaults.IGNORE, 'W391', style_guide.Decision.Ignored),
+ (['E', 'W'], ['E13'], 'E131', style_guide.Decision.Ignored),
+ (defaults.SELECT, ['E13'], 'E131', style_guide.Decision.Ignored),
+ (defaults.SELECT, defaults.IGNORE, 'E126', style_guide.Decision.Ignored),
+ (defaults.SELECT, defaults.IGNORE, 'W391', style_guide.Decision.Selected),
])
def test_should_report_error(select_list, ignore_list, error_code, expected):
"""Verify we decide when to report an error."""
@@ -141,7 +148,7 @@ def test_should_report_error(select_list, ignore_list, error_code, expected):
(defaults.SELECT, [], ['I1'], [], 'I100',
style_guide.Decision.Selected),
(defaults.SELECT, [], ['I1'], [], 'I201',
- style_guide.Decision.Selected),
+ style_guide.Decision.Ignored),
(defaults.SELECT, ['I2'], ['I1'], [], 'I101',
style_guide.Decision.Selected),
(defaults.SELECT, ['I2'], ['I1'], [], 'I201',
@@ -156,10 +163,22 @@ def test_should_report_error(select_list, ignore_list, error_code, expected):
style_guide.Decision.Ignored),
(defaults.SELECT, ['U401'], [], ['U4'], 'U402',
style_guide.Decision.Selected),
+ (['E', 'W'], ['E13'], [], [], 'E131', style_guide.Decision.Ignored),
+ (['E', 'W'], ['E13'], [], [], 'E126', style_guide.Decision.Selected),
(['E2'], ['E21'], [], [], 'E221', style_guide.Decision.Selected),
(['E2'], ['E21'], [], [], 'E212', style_guide.Decision.Ignored),
(['F', 'W'], ['C90'], ['I1'], [], 'C901',
style_guide.Decision.Ignored),
+ (['E', 'W'], ['C'], [], [], 'E131',
+ style_guide.Decision.Selected),
+ (defaults.SELECT, defaults.IGNORE, [], ['I'], 'I101',
+ style_guide.Decision.Selected),
+ (defaults.SELECT, defaults.IGNORE, ['G'], ['I'], 'G101',
+ style_guide.Decision.Selected),
+ (defaults.SELECT, ['G1'], ['G'], ['I'], 'G101',
+ style_guide.Decision.Ignored),
+ (defaults.SELECT, ['E126'], [], ['I'], 'I101',
+ style_guide.Decision.Selected),
]
)
def test_decision_for_logic(select, ignore, extend_select, enabled_extensions,