From 051d76a63f6b220e38cc53a54efe4bf800a3dcf3 Mon Sep 17 00:00:00 2001 From: Andras Tim Date: Mon, 17 Jul 2017 01:25:07 +0200 Subject: [PATCH] Fixed E124 flake8 errors closing bracket does not match visual indentation --- _pytest/python.py | 4 ++-- _pytest/skipping.py | 6 +++--- testing/acceptance_test.py | 2 +- testing/code/test_excinfo.py | 2 +- testing/python/metafunc.py | 6 +++--- testing/test_assertrewrite.py | 2 +- testing/test_terminal.py | 2 +- tox.ini | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/_pytest/python.py b/_pytest/python.py index 1720c8762..222f5d915 100644 --- a/_pytest/python.py +++ b/_pytest/python.py @@ -122,11 +122,11 @@ def pytest_configure(config): "decorated test function, one with arg1=1 and another with arg1=2." "see http://pytest.org/latest/parametrize.html for more info and " "examples." - ) + ) config.addinivalue_line("markers", "usefixtures(fixturename1, fixturename2, ...): mark tests as needing " "all of the specified fixtures. see http://pytest.org/latest/fixture.html#usefixtures " - ) + ) @hookimpl(trylast=True) diff --git a/_pytest/skipping.py b/_pytest/skipping.py index 5af1ca404..2229beb07 100644 --- a/_pytest/skipping.py +++ b/_pytest/skipping.py @@ -40,14 +40,14 @@ def pytest_configure(config): "skip(reason=None): skip the given test function with an optional reason. " "Example: skip(reason=\"no way of currently testing this\") skips the " "test." - ) + ) config.addinivalue_line("markers", "skipif(condition): skip the given test function if eval(condition) " "results in a True value. Evaluation happens within the " "module global context. Example: skipif('sys.platform == \"win32\"') " "skips the test if we are on the win32 platform. see " "http://pytest.org/latest/skipping.html" - ) + ) config.addinivalue_line("markers", "xfail(condition, reason=None, run=True, raises=None, strict=False): " "mark the test function as an expected failure if eval(condition) " @@ -56,7 +56,7 @@ def pytest_configure(config): "If only specific exception(s) are expected, you can list them in " "raises, and if the test fails in other ways, it will be reported as " "a true failure. See http://pytest.org/latest/skipping.html" - ) + ) class XFailed(fail.Exception): diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index 9cb2650de..3b3023f6c 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -410,7 +410,7 @@ class TestGeneralUsage(object): def test_stuff(r): pass """ - ) + ) res = testdir.runpytest(p) res.stdout.fnmatch_lines([ '*1 passed*' diff --git a/testing/code/test_excinfo.py b/testing/code/test_excinfo.py index 0b074d64a..7da68e598 100644 --- a/testing/code/test_excinfo.py +++ b/testing/code/test_excinfo.py @@ -934,7 +934,7 @@ raise ValueError() @pytest.mark.parametrize('reproptions', [ {'style': style, 'showlocals': showlocals, 'funcargs': funcargs, 'tbfilter': tbfilter - } for style in ("long", "short", "no") + } for style in ("long", "short", "no") for showlocals in (True, False) for tbfilter in (True, False) for funcargs in (True, False)]) diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py index 380dbf0e6..38cf19a6e 100644 --- a/testing/python/metafunc.py +++ b/testing/python/metafunc.py @@ -279,7 +279,7 @@ class TestMetafunc(object): assert result == ["10.0-IndexError()", "20-KeyError()", "three-b2", - ] + ] @pytest.mark.issue351 def test_idmaker_idfn_unique_names(self): @@ -291,11 +291,11 @@ class TestMetafunc(object): result = idmaker(("a", "b"), [pytest.param(10.0, IndexError()), pytest.param(20, KeyError()), pytest.param("three", [1, 2, 3]), - ], idfn=ids) + ], idfn=ids) assert result == ["a-a0", "a-a1", "a-a2", - ] + ] @pytest.mark.issue351 def test_idmaker_idfn_exception(self): diff --git a/testing/test_assertrewrite.py b/testing/test_assertrewrite.py index 52f97964e..7f38b4d16 100644 --- a/testing/test_assertrewrite.py +++ b/testing/test_assertrewrite.py @@ -609,7 +609,7 @@ def test_rewritten(): def test_optimized(): "hello" assert test_optimized.__doc__ is None""" - ) + ) p = py.path.local.make_numbered_dir(prefix="runpytest-", keep=None, rootdir=testdir.tmpdir) tmp = "--basetemp=%s" % p diff --git a/testing/test_terminal.py b/testing/test_terminal.py index f7b9c952f..6a099fa3b 100644 --- a/testing/test_terminal.py +++ b/testing/test_terminal.py @@ -415,7 +415,7 @@ class TestTerminalFunctional(object): def test_three(): pass """ - ) + ) result = testdir.runpytest("-k", "test_two:", testpath) result.stdout.fnmatch_lines([ "*test_deselected.py ..", diff --git a/tox.ini b/tox.ini index 5af00a12a..b347c3116 100644 --- a/tox.ini +++ b/tox.ini @@ -196,6 +196,6 @@ filterwarnings = ignore:.*inspect.getargspec.*deprecated, use inspect.signature.*:DeprecationWarning [flake8] -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 +ignore = 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