less hacky

Author: altendky

pytest_twisted.py

@@ -365,19 +365,28 @@ def pytest_pyfunc_call(pyfuncitem):
     # TODO: only handle 'our' tests?  what is the point of handling others?
     #       well, because our interface allowed people to return deferreds
     #       from arbitrary tests so we kinda have to keep this up for now
-    f = pyfuncitem.obj.hypothesis.inner_test
-    pyfuncitem.obj.hypothesis.inner_test = lambda **kwargs: _run_inline_callbacks(_async_pytest_pyfunc_call, pyfuncitem, f, kwargs)
-    return None
+    maybe_hypothesis = getattr(pyfuncitem.obj, "hypothesis", None)
+    if maybe_hypothesis is None:
+        _run_inline_callbacks(_async_pytest_pyfunc_call, pyfuncitem, pyfuncitem.obj, {})
+        result = not None
+    else:
+        hypothesis = maybe_hypothesis
+        f = hypothesis.inner_test
+        pyfuncitem.obj.hypothesis.inner_test = lambda **kwargs: _run_inline_callbacks(_async_pytest_pyfunc_call, pyfuncitem, f, kwargs)
+        result = None
+
+    return result
 
 
 @defer.inlineCallbacks
 def _async_pytest_pyfunc_call(pyfuncitem, f, kwargs):
     """Run test function."""
-    kwargs.update({
+    fixture_kwargs = {
         name: value
         for name, value in pyfuncitem.funcargs.items()
         if name in pyfuncitem._fixtureinfo.argnames
-    })
+    }
+    kwargs.update(fixture_kwargs)
 
     maybe_mark = _get_mark(f)
     if maybe_mark == 'async_test':

setup.py

@@ -16,7 +16,7 @@
     python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*',
     install_requires=["greenlet", "pytest>=2.3", "decorator"],
     extras_require={
-        "dev": ["pre-commit", "black"],
+        "dev": ["pre-commit", "black", "hypothesis"],
         "pyside2": [
             # >= 0.6.3 for PySide2 extra version constraints
             "qt5reactor[pyside2]>=0.6.3",

test.py

@@ -1255,3 +1255,75 @@ def test_should_not_run():
         rr.stdout.no_re_match_line(pat=pattern)
     else:
         assert re.match(pattern, rr.stdout.str()) is None
+
+
+def test_hypothesis_async_passes(testdir, cmd_opts):
+    test_file = """
+    import hypothesis
+    import hypothesis.strategies
+
+    import pytest_twisted
+
+    @hypothesis.given(x=hypothesis.strategies.integers())
+    @pytest_twisted.ensureDeferred
+    async def test_async(x):
+        assert isinstance(x, int)
+    """
+    testdir.makepyfile(test_file)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
+    assert_outcomes(rr, {"passed": 1})
+
+
+def test_hypothesis_inline_callbacks_passes(testdir, cmd_opts):
+    test_file = """
+    import hypothesis
+    import hypothesis.strategies
+
+    import pytest_twisted
+
+    @hypothesis.given(x=hypothesis.strategies.integers())
+    @pytest_twisted.inlineCallbacks
+    def test_inline_callbacks(x):
+        assert isinstance(x, int)
+        return
+        yield
+    """
+    testdir.makepyfile(test_file)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
+    assert_outcomes(rr, {"passed": 1})
+
+
+def test_hypothesis_async_ils(testdir, cmd_opts):
+    test_file = """
+    import hypothesis
+    import hypothesis.strategies
+
+    import pytest_twisted
+
+    @hypothesis.given(x=hypothesis.strategies.integers())
+    @pytest_twisted.ensureDeferred
+    async def test_async(x):
+        assert isinstance(x, str)
+    """
+    testdir.makepyfile(test_file)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
+    assert_outcomes(rr, {"failed": 1})
+
+
+def test_hypothesis_inline_callbacks_fails(testdir, cmd_opts):
+    test_file = """
+    import hypothesis
+    import hypothesis.strategies
+
+    import pytest_twisted
+
+    @hypothesis.given(x=hypothesis.strategies.integers())
+    @pytest_twisted.inlineCallbacks
+    def test_inline_callbacks(x):
+        assert isinstance(x, str)
+        return
+        yield
+    """
+    testdir.makepyfile(test_file)
+    rr = testdir.run(*cmd_opts, timeout=timeout)
+    assert_outcomes(rr, {"failed": 1})