Merge branch 'master' into feature/asyncio-reactor-support

Author: altendky

README.rst

@@ -7,8 +7,8 @@ pytest-twisted - test twisted code with pytest
 |PyPI| |Pythons| |Travis| |AppVeyor| |Black|
 
 :Authors: Ralf Schmitt, Kyle Altendorf, Victor Titor
-:Version: 1.9
-:Date:    2019-01-21
+:Version: 1.10
+:Date:    2019-04-01
 :Download: https://pypi.python.org/pypi/pytest-twisted#downloads
 :Code: https://github.com/pytest-dev/pytest-twisted
 

pytest_twisted.py

@@ -107,17 +107,14 @@ def stop_twisted_greenlet():
 
 def _pytest_pyfunc_call(pyfuncitem):
     testfunction = pyfuncitem.obj
-    if pyfuncitem._isyieldedfunction():
-        return testfunction(*pyfuncitem._args)
+    funcargs = pyfuncitem.funcargs
+    if hasattr(pyfuncitem, "_fixtureinfo"):
+        testargs = {}
+        for arg in pyfuncitem._fixtureinfo.argnames:
+            testargs[arg] = funcargs[arg]
     else:
-        funcargs = pyfuncitem.funcargs
-        if hasattr(pyfuncitem, "_fixtureinfo"):
-            testargs = {}
-            for arg in pyfuncitem._fixtureinfo.argnames:
-                testargs[arg] = funcargs[arg]
-        else:
-            testargs = funcargs
-        return testfunction(**testargs)
+        testargs = funcargs
+    return testfunction(**testargs)
 
 
 def pytest_pyfunc_call(pyfuncitem):

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name="pytest-twisted",
-    version="1.9",
+    version="1.10",
     description="A twisted plugin for py.test.",
     long_description=long_description,
     long_description_content_type="text/x-rst",

testing/test_basic.py

@@ -3,8 +3,6 @@
 
 import pytest
 
-import pytest_twisted
-
 
 ASYNC_AWAIT = sys.version_info >= (3, 5)
 
@@ -37,7 +35,9 @@ def format_run_result_output_for_assert(run_result):
 def skip_if_reactor_not(request, expected_reactor):
     actual_reactor = request.config.getoption("reactor", "default")
     if actual_reactor != expected_reactor:
-        pytest.skip("reactor is {} not {}".format(actual_reactor, expected_reactor))
+        pytest.skip(
+            "reactor is {} not {}".format(actual_reactor, expected_reactor),
+        )
 
 
 def skip_if_no_async_await():