Merge branch 'master' into 31-altendky-async_callbacks

Author: altendky

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+filterwarnings = error

pytest_twisted.py

@@ -26,15 +26,6 @@ class _instances:
     reactor = None
 
 
-def pytest_namespace():
-    return {
-        "inlineCallbacks": inlineCallbacks,
-        "async_yield": async_yield,
-        "async_await": async_await,
-        "blockon": blockon,
-    }
-
-
 def blockon(d):
     if _config.external_reactor:
         return block_from_thread(d)
@@ -201,4 +192,8 @@ def pytest_addoption(parser):
 
 
 def pytest_configure(config):
+    pytest.inlineCallbacks = inlineCallbacks
+    pytest.blockon = blockon
+    pytest.async_yield = async_yield
+    pytest.async_await = async_await
     reactor_installers[config.getoption("reactor")]()

testing/test_basic.py

@@ -31,12 +31,10 @@ def format_run_result_output_for_assert(run_result):
     )
 
 
-def skip_if_reactor_not(expected_reactor):
-    actual_reactor = pytest.config.getoption("reactor", "default")
-    return pytest.mark.skipif(
-        actual_reactor != expected_reactor,
-        reason="reactor is {} not {}".format(actual_reactor, expected_reactor),
-    )
+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))
 
 
 def skip_if_no_async_await():
@@ -52,6 +50,22 @@ def cmd_opts(request):
     return ("--reactor={}".format(reactor),)
 
 
+def test_inline_callbacks_in_pytest():
+    assert hasattr(pytest, 'inlineCallbacks')
+
+
+def test_blockon_in_pytest():
+    assert hasattr(pytest, 'blockon')
+
+
+def test_async_yield_in_pytest():
+    assert hasattr(pytest, 'async_yield')
+
+
+def test_async_await_in_pytest():
+    assert hasattr(pytest, 'async_await')
+
+
 def test_async_yield_is_inlineCallbacks():
     assert pytest_twisted.async_yield is pytest_twisted.inlineCallbacks
 
@@ -226,8 +240,8 @@ async def test_succeed(foo):
     assert_outcomes(rr, {"passed": 2, "failed": 1})
 
 
-@skip_if_reactor_not("default")
-def test_blockon_in_hook(testdir, cmd_opts):
+def test_blockon_in_hook(testdir, cmd_opts, request):
+    skip_if_reactor_not(request, "default")
     conftest_file = """
     import pytest_twisted as pt
     from twisted.internet import reactor, defer
@@ -254,8 +268,8 @@ def test_succeed():
     assert_outcomes(rr, {"passed": 1})
 
 
-@skip_if_reactor_not("default")
-def test_wrong_reactor(testdir, cmd_opts):
+def test_wrong_reactor(testdir, cmd_opts, request):
+    skip_if_reactor_not(request, "default")
     conftest_file = """
     def pytest_addhooks():
         import twisted.internet.reactor
@@ -271,8 +285,8 @@ def test_succeed():
     assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()
 
 
-@skip_if_reactor_not("qt5reactor")
-def test_blockon_in_hook_with_qt5reactor(testdir, cmd_opts):
+def test_blockon_in_hook_with_qt5reactor(testdir, cmd_opts, request):
+    skip_if_reactor_not(request, "qt5reactor")
     conftest_file = """
     import pytest_twisted as pt
     import pytestqt
@@ -301,8 +315,8 @@ def test_succeed():
     assert_outcomes(rr, {"passed": 1})
 
 
-@skip_if_reactor_not("qt5reactor")
-def test_wrong_reactor_with_qt5reactor(testdir, cmd_opts):
+def test_wrong_reactor_with_qt5reactor(testdir, cmd_opts, request):
+    skip_if_reactor_not(request, "qt5reactor")
     conftest_file = """
     def pytest_addhooks():
         import twisted.internet.default
@@ -318,8 +332,8 @@ def test_succeed():
     assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()
 
 
-@skip_if_reactor_not("default")
-def test_pytest_from_reactor_thread(testdir):
+def test_pytest_from_reactor_thread(testdir, request):
+    skip_if_reactor_not(request, "default")
     test_file = """
     import pytest
     import pytest_twisted

tox.ini

@@ -16,8 +16,8 @@ deps=
     qt5reactor: pyqt5
     win: pywin32
 commands=
-    defaultreactor: py.test --reactor=default
-    qt5reactor: py.test --reactor=qt5reactor
+    defaultreactor: pytest --reactor=default
+    qt5reactor: pytest --reactor=qt5reactor
 sitepackages=False
 
 [testenv:linting]