diff --git a/testing/python/fixture.py b/testing/python/fixture.py index ff6a6915a..9985ee08d 100644 --- a/testing/python/fixture.py +++ b/testing/python/fixture.py @@ -655,7 +655,7 @@ class TestRequestBasic(object): result = testdir.runpytest(p) result.stdout.fnmatch_lines([ "*1 error*" # XXX the whole module collection fails - ]) + ]) def test_request_subrequest_addfinalizer_exceptions(self, testdir): """ diff --git a/testing/test_runner.py b/testing/test_runner.py index eb7e161a3..1b796917a 100644 --- a/testing/test_runner.py +++ b/testing/test_runner.py @@ -262,11 +262,11 @@ class BaseFunctionalTests(object): assert reps[2].failed assert reps[2].when == "teardown" assert reps[2].longrepr.reprcrash.message in ( - # python3 error - "TypeError: teardown_method() missing 2 required positional arguments: 'y' and 'z'", - # python2 error - 'TypeError: teardown_method() takes exactly 4 arguments (2 given)' - ) + # python3 error + "TypeError: teardown_method() missing 2 required positional arguments: 'y' and 'z'", + # python2 error + 'TypeError: teardown_method() takes exactly 4 arguments (2 given)' + ) def test_failure_in_setup_function_ignores_custom_repr(self, testdir): testdir.makepyfile(conftest=""" diff --git a/testing/test_terminal.py b/testing/test_terminal.py index 27d46add4..f7b9c952f 100644 --- a/testing/test_terminal.py +++ b/testing/test_terminal.py @@ -78,7 +78,7 @@ class TestTerminal(object): else: result.stdout.fnmatch_lines([ "*test_pass_skip_fail.py .sF" - ]) + ]) result.stdout.fnmatch_lines([ " def test_func():", "> assert 0", @@ -378,7 +378,7 @@ class TestFixtureReporting(object): "*def test_fail():", "*failingfunc*", "*1 failed*1 error*", - ]) + ]) def test_setup_teardown_output_and_test_failure(self, testdir): """ Test for issue #442 """ @@ -403,7 +403,7 @@ class TestFixtureReporting(object): "*teardown func*", "*1 failed*", - ]) + ]) class TestTerminalFunctional(object): def test_deselected(self, testdir): @@ -817,8 +817,8 @@ def test_tbstyle_native_setup_error(testdir): """) result = testdir.runpytest("--tb=native") result.stdout.fnmatch_lines([ - '*File *test_tbstyle_native_setup_error.py", line *, in setup_error_fixture*' - ]) + '*File *test_tbstyle_native_setup_error.py", line *, in setup_error_fixture*' + ]) def test_terminal_summary(testdir): testdir.makeconftest(""" diff --git a/tox.ini b/tox.ini index dec64c85f..5af00a12a 100644 --- a/tox.ini +++ b/tox.ini @@ -196,6 +196,6 @@ filterwarnings = ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning [flake8] -ignore = E123,E124,E125,E126,E127,E128,E129,E131,E201,E202,E203,E221,E222,E225,E226,E231,E241,E251,E261,E262,E265,E271,E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731 +ignore = E124,E125,E126,E127,E128,E129,E131,E201,E202,E203,E221,E222,E225,E226,E231,E241,E251,E261,E262,E265,E271,E272,E293,E301,E302,E303,E401,E402,E501,E701,E702,E704,E712,E731 max-line-length = 120 exclude = _pytest/vendored_packages/pluggy.py