Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: PyCQA/flake8
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7c89ee3babbfeb944e59ba15f212b7cc3c799b06
Choose a base ref
..
head repository: PyCQA/flake8
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2bb03083632f59184e71ea8e92a4b2ad6e14e89c
Choose a head ref
Showing with 112 additions and 16 deletions.
  1. +109 −15 tests/unit/test_decision_engine.py
  2. +3 −1 tests/unit/test_style_guide.py
124 changes: 109 additions & 15 deletions tests/unit/test_decision_engine.py
View file
Original file line number Diff line number Diff line change
@@ -52,7 +52,9 @@ def test_was_ignored_ignores_errors(ignore_list, extend_ignore, error_code):
(["E2", "E12"], ["W11", "E3"], "E111"),
],
)
def test_was_ignored_implicitly_selects_errors(ignore_list, extend_ignore, error_code):
def test_was_ignored_implicitly_selects_errors(
ignore_list, extend_ignore, error_code
):
"""Verify we detect users does not explicitly ignore an error."""
decider = style_guide.DecisionEngine(
create_options(ignore=ignore_list, extend_ignore=extend_ignore)
@@ -134,12 +136,30 @@ def test_was_selected_excludes_errors(select_list, error_code):
(["E2", "E12"], [], [], "E410", style_guide.Decision.Ignored),
(["E11", "E121"], ["E1"], [], "E112", style_guide.Decision.Selected),
(["E11", "E121"], [], ["E1"], "E112", style_guide.Decision.Selected),
(["E111", "E121"], ["E2"], ["E3"], "E122", style_guide.Decision.Ignored),
(
["E111", "E121"],
["E2"],
["E3"],
"E122",
style_guide.Decision.Ignored,
),
(["E11", "E12"], ["E13"], [], "E132", style_guide.Decision.Ignored),
(["E1", "E3"], ["E32"], [], "E321", style_guide.Decision.Ignored),
([], ["E2", "E12"], [], "E410", style_guide.Decision.Ignored),
(["E4"], ["E2", "E12", "E41"], [], "E410", style_guide.Decision.Ignored),
(["E41"], ["E2", "E12", "E4"], [], "E410", style_guide.Decision.Selected),
(
["E4"],
["E2", "E12", "E41"],
[],
"E410",
style_guide.Decision.Ignored,
),
(
["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),
@@ -154,14 +174,24 @@ def test_was_selected_excludes_errors(select_list, error_code):
"E126",
style_guide.Decision.Ignored,
),
(defaults.SELECT, defaults.IGNORE, [], "W391", style_guide.Decision.Selected),
(
defaults.SELECT,
defaults.IGNORE,
[],
"W391",
style_guide.Decision.Selected,
),
],
)
def test_decision_for(select_list, ignore_list, extend_ignore, error_code, expected):
def test_decision_for(
select_list, ignore_list, extend_ignore, error_code, expected
):
"""Verify we decide when to report an error."""
decider = style_guide.DecisionEngine(
create_options(
select=select_list, ignore=ignore_list, extend_ignore=extend_ignore
select=select_list,
ignore=ignore_list,
extend_ignore=extend_ignore,
)
)

@@ -172,8 +202,24 @@ def test_decision_for(select_list, ignore_list, extend_ignore, error_code, expec
"select,ignore,extended_default_ignore,extended_default_select,"
"enabled_extensions,error_code,expected",
[
(defaults.SELECT, [], [], ["I1"], [], "I100", style_guide.Decision.Selected),
(defaults.SELECT, [], [], ["I1"], [], "I201", style_guide.Decision.Ignored),
(
defaults.SELECT,
[],
[],
["I1"],
[],
"I100",
style_guide.Decision.Selected,
),
(
defaults.SELECT,
[],
[],
["I1"],
[],
"I201",
style_guide.Decision.Ignored,
),
(
defaults.SELECT,
["I2"],
@@ -183,7 +229,15 @@ def test_decision_for(select_list, ignore_list, extend_ignore, error_code, expec
"I101",
style_guide.Decision.Selected,
),
(defaults.SELECT, ["I2"], [], ["I1"], [], "I201", style_guide.Decision.Ignored),
(
defaults.SELECT,
["I2"],
[],
["I1"],
[],
"I201",
style_guide.Decision.Ignored,
),
(
defaults.SELECT,
["I1"],
@@ -202,7 +256,15 @@ def test_decision_for(select_list, ignore_list, extend_ignore, error_code, expec
"I101",
style_guide.Decision.Ignored,
),
(defaults.SELECT, [], [], [], ["U4"], "U401", style_guide.Decision.Selected),
(
defaults.SELECT,
[],
[],
[],
["U4"],
"U401",
style_guide.Decision.Selected,
),
(
defaults.SELECT,
["U401"],
@@ -221,12 +283,44 @@ def test_decision_for(select_list, ignore_list, extend_ignore, error_code, expec
"U402",
style_guide.Decision.Selected,
),
(["E", "W"], ["E13"], [], [], [], "E131", style_guide.Decision.Ignored),
(["E", "W"], ["E13"], [], [], [], "E126", 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),
(
["F", "W"],
["C90"],
[],
["I1"],
[],
"C901",
style_guide.Decision.Ignored,
),
(
["E", "W"],
["C"],
[],
[],
[],
"E131",
style_guide.Decision.Selected,
),
(
defaults.SELECT,
defaults.IGNORE,
4 changes: 3 additions & 1 deletion tests/unit/test_style_guide.py
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,9 @@ def test_handle_error_does_not_raise_type_errors():
stats=statistics.Statistics(),
)

assert 1 == guide.handle_error("T111", "file.py", 1, None, "error found", "a = 1")
assert 1 == guide.handle_error(
"T111", "file.py", 1, None, "error found", "a = 1"
)


def test_style_guide_manager():