Merge branch 'main' into add_3.10

Author: altendky

.github/workflows/ci.yml

@@ -37,8 +37,8 @@ jobs:
               3.9: docker://python:3.9-buster
               3.10: docker://python:3.10-buster
               pypy2.7: docker://pypy:2.7-buster
-              pypy3.6: docker://pypy:3.6-buster
               pypy3.7: docker://pypy:3.7-buster
+              pypy3.8: docker://pypy:3.8-buster
           - name: 🪟
             runs-on: windows-latest
             python_platform: win32
@@ -94,18 +94,18 @@ jobs:
             docker: pypy2.7
             implementation: pypy
             major: 2
-          - name: PyPy 3.6
-            tox: pypy36
-            action: pypy-3.6
-            docker: pypy3.6
-            implementation: pypy
-            major: 3
           - name: PyPy 3.7
             tox: pypy37
             action: pypy-3.7
             docker: pypy3.7
             implementation: pypy
             major: 3
+          - name: PyPy 3.8
+            tox: pypy38
+            action: pypy-3.8
+            docker: pypy3.8
+            implementation: pypy
+            major: 3
         reactor:
           - name: default
             tox: default

pytest_twisted.py

@@ -3,6 +3,7 @@
 import itertools
 import signal
 import sys
+import threading
 import warnings
 
 import decorator
@@ -200,7 +201,16 @@ def init_twisted_greenlet():
         return
 
     if not _instances.reactor.running:
-        if signal.getsignal(signal.SIGINT) == signal.default_int_handler:
+        if not isinstance(threading.current_thread(), threading._MainThread):
+            warnings.warn(
+                (
+                    'Will not attempt to block Twisted signal configuration'
+                    ' since we are not running in the main thread.  See'
+                    ' https://github.com/pytest-dev/pytest-twisted/issues/153.'
+                ),
+                RuntimeWarning,
+            )
+        elif signal.getsignal(signal.SIGINT) == signal.default_int_handler:
             signal.signal(
                 signal.SIGINT,
                 functools.partial(signal.default_int_handler),
@@ -365,27 +375,51 @@ 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
-    _run_inline_callbacks(_async_pytest_pyfunc_call, pyfuncitem)
-    return not 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
+
+        def inner_test(**kwargs):
+            return _run_inline_callbacks(
+                _async_pytest_pyfunc_call,
+                pyfuncitem,
+                f,
+                kwargs,
+            )
+
+        pyfuncitem.obj.hypothesis.inner_test = inner_test
+        result = None
+
+    return result
 
 
 @defer.inlineCallbacks
-def _async_pytest_pyfunc_call(pyfuncitem):
+def _async_pytest_pyfunc_call(pyfuncitem, f, kwargs):
     """Run test function."""
-    kwargs = {
+    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(pyfuncitem.obj)
+    maybe_mark = _get_mark(f)
     if maybe_mark == 'async_test':
-        result = yield defer.ensureDeferred(pyfuncitem.obj(**kwargs))
+        result = yield defer.ensureDeferred(f(**kwargs))
     elif maybe_mark == 'inline_callbacks_test':
-        result = yield pyfuncitem.obj(**kwargs)
+        result = yield f(**kwargs)
     else:
         # TODO: maybe deprecate this
-        result = yield pyfuncitem.obj(**kwargs)
+        result = yield f(**kwargs)
 
     defer.returnValue(result)
 

testing/conftest.py

@@ -2,7 +2,7 @@
 import pytest_twisted
 
 
-pytest_plugins = "_pytest.pytester"
+pytest_plugins = "pytester"
 
 
 @pytest.hookimpl(tryfirst=True)

testing/test_basic.py

@@ -93,6 +93,21 @@ def skip_if_no_async_generators():
     )
 
 
+def skip_if_hypothesis_unavailable():
+    def hypothesis_unavailable():
+        try:
+            import hypothesis  # noqa: F401
+        except ImportError:
+            return True
+
+        return False
+
+    return pytest.mark.skipif(
+        hypothesis_unavailable(),
+        reason="hypothesis not installed",
+    )
+
+
 @pytest.fixture
 def cmd_opts(request):
     reactor = request.config.getoption("reactor", "default")
@@ -1255,3 +1270,81 @@ def test_should_not_run():
         rr.stdout.no_re_match_line(pat=pattern)
     else:
         assert re.match(pattern, rr.stdout.str()) is None
+
+
+@skip_if_no_async_await()
+@skip_if_hypothesis_unavailable()
+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})
+
+
+@skip_if_hypothesis_unavailable()
+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})
+
+
+@skip_if_no_async_await()
+@skip_if_hypothesis_unavailable()
+def test_hypothesis_async_fails(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})
+
+
+@skip_if_hypothesis_unavailable()
+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})

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist=
-    py{27,py27,35,36,37,38,39,310,py36,py37}-defaultreactor
-    py{35,36,37,38,39,310,py36,py37}-asyncioreactor
+    py{27,py27,35,36,37,38,39,310,py37,py38}-defaultreactor
+    py{35,36,37,38,39,310,py37,py38}-asyncioreactor
     py{35,36,37,38,39,310}-pyqt5reactor
     py{35,36,37,38,39,310}-pyside2reactor
     linting
@@ -11,6 +11,7 @@ deps=
     greenlet
     pytest
     twisted
+    py37,py38,py39,pypy37,pypy38: hypothesis
     pyqt5reactor,pyside2reactor: pytest-qt
     pyqt5reactor,pyside2reactor: pytest-xvfb
     pyqt5reactor,pyside2reactor: pywin32; sys_platform == 'win32'