diff options
| author | Andras Tim <andras.tim@gmail.com> | 2017-07-17 01:25:09 +0200 |
|---|---|---|
| committer | Andras Tim <andras.tim@gmail.com> | 2017-07-17 01:44:23 +0200 |
| commit | b840622819ee9867e92b094a07b371be68a1a43b (patch) | |
| tree | 3d94226e509c2b642e610800b8dbd287a2c9315d /testing/test_skipping.py | |
| parent | 17a21d540bb7d5e8fc2da115b29e6f5c0c966b43 (diff) | |
| download | pytest-b840622819ee9867e92b094a07b371be68a1a43b.tar.gz | |
Fixed E302 flake8 errors
expected 2 blank lines, found 0
Diffstat (limited to 'testing/test_skipping.py')
| -rw-r--r-- | testing/test_skipping.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/testing/test_skipping.py b/testing/test_skipping.py index 3c92105d6..586244f23 100644 --- a/testing/test_skipping.py +++ b/testing/test_skipping.py @@ -582,6 +582,7 @@ class TestSkip(object): "*1 skipped*", ]) + class TestSkipif(object): def test_skipif_conditional(self, testdir): item = testdir.getitem(""" @@ -687,6 +688,7 @@ def test_skip_reasons_folding(): assert lineno == lineno assert reason == message + def test_skipped_reasons_functional(testdir): testdir.makepyfile( test_one=""" @@ -711,6 +713,7 @@ def test_skipped_reasons_functional(testdir): ]) assert result.ret == 0 + def test_reportchars(testdir): testdir.makepyfile(""" import pytest @@ -733,6 +736,7 @@ def test_reportchars(testdir): "SKIP*four*", ]) + def test_reportchars_error(testdir): testdir.makepyfile( conftest=""" @@ -748,6 +752,7 @@ def test_reportchars_error(testdir): 'ERROR*test_foo*', ]) + def test_reportchars_all(testdir): testdir.makepyfile(""" import pytest @@ -770,6 +775,7 @@ def test_reportchars_all(testdir): "XPASS*test_3*", ]) + def test_reportchars_all_error(testdir): testdir.makepyfile( conftest=""" @@ -785,6 +791,7 @@ def test_reportchars_all_error(testdir): 'ERROR*test_foo*', ]) + @pytest.mark.xfail("hasattr(sys, 'pypy_version_info')") def test_errors_in_xfail_skip_expressions(testdir): testdir.makepyfile(""" @@ -816,6 +823,7 @@ def test_errors_in_xfail_skip_expressions(testdir): "*1 pass*2 error*", ]) + def test_xfail_skipif_with_globals(testdir): testdir.makepyfile(""" import pytest @@ -834,6 +842,7 @@ def test_xfail_skipif_with_globals(testdir): "*x == 3*", ]) + def test_direct_gives_error(testdir): testdir.makepyfile(""" import pytest @@ -854,6 +863,7 @@ def test_default_markers(testdir): "*xfail(*condition, reason=None, run=True, raises=None, strict=False)*expected failure*", ]) + def test_xfail_test_setup_exception(testdir): testdir.makeconftest(""" def pytest_runtest_setup(): @@ -870,6 +880,7 @@ def test_xfail_test_setup_exception(testdir): assert 'xfailed' in result.stdout.str() assert 'xpassed' not in result.stdout.str() + def test_imperativeskip_on_xfail_test(testdir): testdir.makepyfile(""" import pytest @@ -893,6 +904,7 @@ def test_imperativeskip_on_xfail_test(testdir): *2 skipped* """) + class TestBooleanCondition(object): def test_skipif(self, testdir): testdir.makepyfile(""" |