diff options
| author | Anthony Sottile <asottile@umich.edu> | 2021-03-14 11:58:03 -0700 |
|---|---|---|
| committer | Anthony Sottile <asottile@umich.edu> | 2021-03-14 11:58:03 -0700 |
| commit | 40aba49d0d0833edf65ee9d3c3a2b511bac6f2dd (patch) | |
| tree | 80fe51912a9d61bfb9ac3127aeaaf3eb2699b0cd /tests | |
| parent | ac9c66e80bed84e78fbb803e6dd9e33cc4c741ca (diff) | |
| download | flake8-40aba49d0d0833edf65ee9d3c3a2b511bac6f2dd.tar.gz | |
upgrade pycodestyle to 2.7.0
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/integration/test_main.py | 3 | ||||
| -rw-r--r-- | tests/unit/conftest.py | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/integration/test_main.py b/tests/integration/test_main.py index 85afa20..e2f58c5 100644 --- a/tests/integration/test_main.py +++ b/tests/integration/test_main.py @@ -252,7 +252,6 @@ t.py:2:6: W292 no newline at end of file ''' -@pytest.mark.xfail(strict=True) # currently awaiting fix in pycodestyle def test_physical_line_file_not_ending_in_newline_trailing_ws(tmpdir, capsys): """See https://github.com/PyCQA/pycodestyle/issues/960.""" t_py_src = 'x = 1 ' @@ -264,7 +263,7 @@ def test_physical_line_file_not_ending_in_newline_trailing_ws(tmpdir, capsys): out, err = capsys.readouterr() assert out == '''\ t.py:1:6: W291 trailing whitespace -t.py:1:10: W292 no newline at end of file +t.py:1:9: W292 no newline at end of file ''' diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index eb76f98..a407b50 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -9,6 +9,7 @@ def options_from(**kwargs): kwargs.setdefault('hang_closing', True) kwargs.setdefault('max_line_length', 79) kwargs.setdefault('max_doc_length', None) + kwargs.setdefault('indent_size', 4) kwargs.setdefault('verbose', False) kwargs.setdefault('stdin_display_name', 'stdin') kwargs.setdefault('disable_noqa', False) |