Make normal fixtures work with "yield"

2016-06-02 21:01:31 -03:00
parent 92323895c9
commit 366879db27
2 changed files with 30 additions and 58 deletions
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -2326,6 +2326,7 @@ def fail_fixturefunc(fixturefunc, msg):
                pytrace=False)

 def call_fixture_func(fixturefunc, request, kwargs, yieldctx):
+    yieldctx = is_generator(fixturefunc)
    if yieldctx:
        if not is_generator(fixturefunc):
            fail_fixturefunc(fixturefunc,