Merge branch 'master' into 35-altendky-tidy_async_await_fixtures

Author: altendky

README.rst

@@ -51,7 +51,7 @@ is to ``import pytest_twisted as pt``.
 
 
 inlineCallbacks
-=================
+===============
 Using ``twisted.internet.defer.inlineCallbacks`` as a decorator for test
 functions, which take funcargs, does not work. Please use
 ``pytest_twisted.inlineCallbacks`` instead::
@@ -61,6 +61,19 @@ functions, which take funcargs, does not work. Please use
       res = yield threads.deferToThread(os.listdir, tmpdir.strpath)
       assert res == []
 
+
+ensureDeferred
+==============
+Using ``twisted.internet.defer.ensureDeferred`` as a decorator for test
+functions, which take funcargs, does not work. Please use
+``pytest_twisted.ensureDeferred`` instead::
+
+  @pytest_twisted.ensureDeferred
+  async def test_some_stuff(tmpdir):
+      res = await threads.deferToThread(os.listdir, tmpdir.strpath)
+      assert res == []
+
+
 Waiting for deferreds in fixtures
 =================================
 ``pytest_twisted.blockon`` allows fixtures to wait for deferreds::

pytest_twisted.py

@@ -62,6 +62,11 @@ def inlineCallbacks(fun, *args, **kw):
     return defer.inlineCallbacks(fun)(*args, **kw)
 
 
+@decorator.decorator
+def ensureDeferred(fun, *args, **kw):
+    return defer.ensureDeferred(fun(*args, **kw))
+
+
 def init_twisted_greenlet():
     if _instances.reactor is None or _instances.gr_twisted:
         return

testing/test_basic.py

@@ -47,7 +47,7 @@ def skip_if_reactor_not(request, expected_reactor):
 def skip_if_no_async_await():
     return pytest.mark.skipif(
         not ASYNC_AWAIT,
-        reason="async/await syntax not support on Python <3.5",
+        reason="async/await syntax not supported on Python <3.5",
     )
 
 
@@ -149,6 +149,28 @@ def test_succeed(foo):
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
+@skip_if_no_async_await()
+def test_async_await(testdir, cmd_opts):
+    test_file = """
+    from twisted.internet import reactor, defer
+    import pytest
+    import pytest_twisted
+
+    @pytest.fixture(scope="module", params=["fs", "imap", "web"])
+    def foo(request):
+        return request.param
+
+    @pytest_twisted.ensureDeferred
+    async def test_succeed(foo):
+        await defer.succeed(foo)
+        if foo == "web":
+            raise RuntimeError("baz")
+    """
+    testdir.makepyfile(test_file)
+    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    assert_outcomes(rr, {"passed": 2, "failed": 1})
+
+
 def test_twisted_greenlet(testdir, cmd_opts):
     test_file = """
     import pytest, greenlet
@@ -194,6 +216,32 @@ def test_succeed(foo):
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
+@skip_if_no_async_await()
+def test_blockon_in_fixture_async(testdir, cmd_opts):
+    test_file = """
+    from twisted.internet import reactor, defer
+    import pytest
+    import pytest_twisted
+
+    @pytest.fixture(scope="module", params=["fs", "imap", "web"])
+    def foo(request):
+        d1, d2 = defer.Deferred(), defer.Deferred()
+        reactor.callLater(0.01, d1.callback, 1)
+        reactor.callLater(0.02, d2.callback, request.param)
+        pytest_twisted.blockon(d1)
+        return d2
+
+    @pytest_twisted.ensureDeferred
+    async def test_succeed(foo):
+        x = await foo
+        if x == "web":
+            raise RuntimeError("baz")
+    """
+    testdir.makepyfile(test_file)
+    rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
+    assert_outcomes(rr, {"passed": 2, "failed": 1})
+
+
 @skip_if_no_async_await()
 def test_async_fixture(testdir, cmd_opts):
     test_file = """