p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make normal fixtures work with "yield"

This commit is contained in:
Bruno Oliveira 2016-06-02 21:01:31 -03:00
parent 92323895c9
commit 366879db27
2 changed files with 30 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
_pytest/python.py
View File

@ -2326,6 +2326,7 @@ def fail_fixturefunc(fixturefunc, msg):
pytrace=False) pytrace=False)
def call_fixture_func(fixturefunc, request, kwargs, yieldctx): def call_fixture_func(fixturefunc, request, kwargs, yieldctx):
yieldctx = is_generator(fixturefunc)
if yieldctx: if yieldctx:
if not is_generator(fixturefunc): if not is_generator(fixturefunc):
fail_fixturefunc(fixturefunc, fail_fixturefunc(fixturefunc,

87
testing/python/fixture.py
View File

@ -2597,11 +2597,13 @@ class TestShowFixtures:
''') ''')
@pytest.mark.parametrize('flavor', ['fixture', 'yield_fixture'])
class TestContextManagerFixtureFuncs: class TestContextManagerFixtureFuncs:
def test_simple(self, testdir):
def test_simple(self, testdir, flavor):
testdir.makepyfile(""" testdir.makepyfile("""
import pytest import pytest
@pytest.yield_fixture @pytest.{flavor}
def arg1(): def arg1():
print ("setup") print ("setup")
yield 1 yield 1
@ -2611,7 +2613,7 @@ class TestContextManagerFixtureFuncs:
def test_2(arg1): def test_2(arg1):
print ("test2 %s" % arg1) print ("test2 %s" % arg1)
assert 0 assert 0
""") """.format(flavor=flavor))
result = testdir.runpytest("-s") result = testdir.runpytest("-s")
result.stdout.fnmatch_lines(""" result.stdout.fnmatch_lines("""
*setup* *setup*
@ -2622,10 +2624,10 @@ class TestContextManagerFixtureFuncs:
*teardown* *teardown*
""") """)
def test_scoped(self, testdir): def test_scoped(self, testdir, flavor):
testdir.makepyfile(""" testdir.makepyfile("""
import pytest import pytest
@pytest.yield_fixture(scope="module") @pytest.{flavor}(scope="module")
def arg1(): def arg1():
print ("setup") print ("setup")
yield 1 yield 1
@ -2634,7 +2636,7 @@ class TestContextManagerFixtureFuncs:
print ("test1 %s" % arg1) print ("test1 %s" % arg1)
def test_2(arg1): def test_2(arg1):
print ("test2 %s" % arg1) print ("test2 %s" % arg1)
""") """.format(flavor=flavor))
result = testdir.runpytest("-s") result = testdir.runpytest("-s")
result.stdout.fnmatch_lines(""" result.stdout.fnmatch_lines("""
*setup* *setup*
@ -2643,94 +2645,63 @@ class TestContextManagerFixtureFuncs:
*teardown* *teardown*
""") """)
def test_setup_exception(self, testdir): def test_setup_exception(self, testdir, flavor):
testdir.makepyfile(""" testdir.makepyfile("""
import pytest import pytest
@pytest.yield_fixture(scope="module") @pytest.{flavor}(scope="module")
def arg1(): def arg1():
pytest.fail("setup") pytest.fail("setup")
yield 1 yield 1
def test_1(arg1): def test_1(arg1):
pass pass
""") """.format(flavor=flavor))
result = testdir.runpytest("-s") result = testdir.runpytest("-s")
result.stdout.fnmatch_lines(""" result.stdout.fnmatch_lines("""
*pytest.fail*setup* *pytest.fail*setup*
*1 error* *1 error*
""") """)
def test_teardown_exception(self, testdir): def test_teardown_exception(self, testdir, flavor):
testdir.makepyfile(""" testdir.makepyfile("""
import pytest import pytest
@pytest.yield_fixture(scope="module") @pytest.{flavor}(scope="module")
def arg1(): def arg1():
yield 1 yield 1
pytest.fail("teardown") pytest.fail("teardown")
def test_1(arg1): def test_1(arg1):
pass pass
""") """.format(flavor=flavor))
result = testdir.runpytest("-s") result = testdir.runpytest("-s")
result.stdout.fnmatch_lines(""" result.stdout.fnmatch_lines("""
*pytest.fail*teardown* *pytest.fail*teardown*
*1 passed*1 error* *1 passed*1 error*
""") """)
def test_yields_more_than_one(self, testdir): def test_yields_more_than_one(self, testdir, flavor):
testdir.makepyfile(""" testdir.makepyfile("""
import pytest import pytest
@pytest.yield_fixture(scope="module") @pytest.{flavor}(scope="module")
def arg1(): def arg1():
yield 1 yield 1
yield 2 yield 2
def test_1(arg1): def test_1(arg1):
pass pass
""") """.format(flavor=flavor))
result = testdir.runpytest("-s") result = testdir.runpytest("-s")
result.stdout.fnmatch_lines(""" result.stdout.fnmatch_lines("""
*fixture function* *fixture function*
*test_yields*:2* *test_yields*:2*
""") """)
# TODO: yield_fixture should work as well (this is bugged right now)
def test_no_yield(self, testdir): def test_custom_name(testdir):
testdir.makepyfile(""" testdir.makepyfile("""
import pytest import pytest
@pytest.yield_fixture(scope="module") @pytest.fixture(name='meow')
def arg1(): def arg1():
return 1 return 'mew'
def test_1(arg1): def test_1(meow):
pass print(meow)
""") """)
result = testdir.runpytest("-s") result = testdir.runpytest("-s")
result.stdout.fnmatch_lines(""" result.stdout.fnmatch_lines("*mew*")
*yield_fixture*requires*yield*
*yield_fixture*
*def arg1*
""")
def test_yield_not_allowed_in_non_yield(self, testdir):
testdir.makepyfile("""
import pytest
@pytest.fixture(scope="module")
def arg1():
yield 1
def test_1(arg1):
pass
""")
result = testdir.runpytest("-s")
result.stdout.fnmatch_lines("""
*fixture*cannot use*yield*
*def arg1*
""")
def test_custom_name(self, testdir):
testdir.makepyfile("""
import pytest
@pytest.fixture(name='meow')
def arg1():
return 'mew'
def test_1(meow):
print(meow)
""")
result = testdir.runpytest("-s")
result.stdout.fnmatch_lines("*mew*")