summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
authorAndras Tim <andras.tim@gmail.com>2017-07-17 01:25:07 +0200
committerAndras Tim <andras.tim@gmail.com>2017-07-17 01:28:16 +0200
commit0be97624b745581af68bb9a0e2c1d04a249c55bf (patch)
tree6f9c07c5bb4e5fcdf3a9d9412542f33fdc24cde9 /testing
parent64a4b9058c4d27b47992f3d816e7969fcdddd102 (diff)
downloadpytest-0be97624b745581af68bb9a0e2c1d04a249c55bf.tar.gz
Fixed E121 flake8 errors
continuation line under-indented for hanging indent
Diffstat (limited to 'testing')
-rw-r--r--testing/python/approx.py18
-rw-r--r--testing/python/fixture.py14
-rw-r--r--testing/test_terminal.py6
3 files changed, 18 insertions, 20 deletions
diff --git a/testing/python/approx.py b/testing/python/approx.py
index d9bbaa4e0..3fac456ff 100644
--- a/testing/python/approx.py
+++ b/testing/python/approx.py
@@ -186,15 +186,15 @@ class TestApprox(object):
def test_expecting_zero(self):
examples = [
- (ne, 1e-6, 0.0),
- (ne, -1e-6, 0.0),
- (eq, 1e-12, 0.0),
- (eq, -1e-12, 0.0),
- (ne, 2e-12, 0.0),
- (ne, -2e-12, 0.0),
- (ne, inf, 0.0),
- (ne, nan, 0.0),
- ]
+ (ne, 1e-6, 0.0),
+ (ne, -1e-6, 0.0),
+ (eq, 1e-12, 0.0),
+ (eq, -1e-12, 0.0),
+ (ne, 2e-12, 0.0),
+ (ne, -2e-12, 0.0),
+ (ne, inf, 0.0),
+ (ne, nan, 0.0),
+ ]
for op, a, x in examples:
assert op(a, approx(x, rel=0.0, abs=1e-12))
assert op(a, approx(x, rel=1e-6, abs=1e-12))
diff --git a/testing/python/fixture.py b/testing/python/fixture.py
index ff49346c6..de41aaca1 100644
--- a/testing/python/fixture.py
+++ b/testing/python/fixture.py
@@ -2659,18 +2659,16 @@ class TestShowFixtures(object):
def test_show_fixtures(self, testdir):
result = testdir.runpytest("--fixtures")
result.stdout.fnmatch_lines([
- "*tmpdir*",
- "*temporary directory*",
- ]
- )
+ "*tmpdir*",
+ "*temporary directory*",
+ ])
def test_show_fixtures_verbose(self, testdir):
result = testdir.runpytest("--fixtures", "-v")
result.stdout.fnmatch_lines([
- "*tmpdir*--*tmpdir.py*",
- "*temporary directory*",
- ]
- )
+ "*tmpdir*--*tmpdir.py*",
+ "*temporary directory*",
+ ])
def test_show_fixtures_testmodule(self, testdir):
p = testdir.makepyfile('''
diff --git a/testing/test_terminal.py b/testing/test_terminal.py
index 45c354206..51c8d642e 100644
--- a/testing/test_terminal.py
+++ b/testing/test_terminal.py
@@ -222,7 +222,7 @@ class TestCollectonly(object):
""")
result = testdir.runpytest("--collect-only",)
result.stdout.fnmatch_lines([
- "<Module 'test_collectonly_basic.py'>",
+ "<Module 'test_collectonly_basic.py'>",
" <Function 'test_func'>",
])
@@ -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):