Merge pull request #1 from vtitor/master

Extract init reactor methods

Author: altendky

.gitignore

@@ -20,3 +20,4 @@ __pycache__/
 /dist/
 /.tox/
 /README.html
+.idea/

pytest_twisted.py

@@ -8,21 +8,27 @@
 from twisted.internet.threads import blockingCallFromThread
 from twisted.python import failure
 
-gr_twisted = None
-reactor = None
+
+class _instances:
+    gr_twisted = None
+    reactor = None
+
+
+def pytest_namespace():
+    return dict(inlineCallbacks=inlineCallbacks, blockon=blockon)
 
 
 def blockon(d):
-    if reactor.running:
+    if _instances.reactor.running:
         return block_from_thread(d)
 
     return blockon_default(d)
 
 
 def blockon_default(d):
     current = greenlet.getcurrent()
-    assert current is not gr_twisted, \
-        "blockon cannot be called from the twisted greenlet"
+    assert current is not _instances.gr_twisted, \
+        'blockon cannot be called from the twisted greenlet'
     result = []
 
     def cb(r):
@@ -32,8 +38,8 @@ def cb(r):
 
     d.addCallbacks(cb, cb)
     if not result:
-        _result = gr_twisted.switch()
-        assert _result is result, "illegal switch in blockon"
+        _result = _instances.gr_twisted.switch()
+        assert _result is result, 'illegal switch in blockon'
 
     if isinstance(result[0], failure.Failure):
         result[0].raiseException()
@@ -42,96 +48,28 @@ def cb(r):
 
 
 def block_from_thread(d):
-    return blockingCallFromThread(reactor, lambda x: x, d)
+    return blockingCallFromThread(_instances.reactor, lambda x: x, d)
 
 
 @decorator.decorator
 def inlineCallbacks(fun, *args, **kw):
     return defer.inlineCallbacks(fun)(*args, **kw)
 
 
-def pytest_namespace():
-    return dict(inlineCallbacks=inlineCallbacks,
-                blockon=blockon)
-
-
-def stop_twisted_greenlet():
-    if gr_twisted:
-        reactor.stop()
-        gr_twisted.switch()
-
-
-def create_twisted_greenlet():
-    global gr_twisted
-    if reactor is None:
+def init_twisted_greenlet():
+    if _instances.reactor is None:
         return
 
-    if not gr_twisted and not reactor.running:
-        gr_twisted = greenlet.greenlet(reactor.run)
+    if not _instances.gr_twisted and not _instances.reactor.running:
+        _instances.gr_twisted = greenlet.greenlet(_instances.reactor.run)
         # give me better tracebacks:
         failure.Failure.cleanFailure = lambda self: None
 
 
-def pytest_addhooks(pluginmanager):
-    create_twisted_greenlet()
-
-
-def pytest_addoption(parser):
-    group = parser.getgroup('twisted')
-    group.addoption('--qt5reactor', dest='qt5reactor', action='store_true',
-                    help='prepare for use with qt5reactor')
-
-
-def pytest_configure(config):
-    # TODO: why is the parameter needed?
-    def default_reactor():
-        global reactor
-        import twisted.internet.reactor
-        reactor = twisted.internet.reactor
-        create_twisted_greenlet()
-
-    def qt5_reactor(qapp):
-        global gr_twisted
-        global reactor
-        import qt5reactor
-
-        reinstalled = False
-
-        try:
-            qt5reactor.install()
-        except error.ReactorAlreadyInstalledError:
-            if not isinstance(reactor, qt5reactor.QtReactor):
-                stop_twisted_greenlet()
-                gr_twisted = None
-                del sys.modules['twisted.internet.reactor']
-                qt5reactor.install()
-                reinstalled = True
-        else:
-            reinstalled = True
-
-        if reinstalled:
-            import twisted.internet.reactor
-            reactor = twisted.internet.reactor
-
-            create_twisted_greenlet()
-
-    if config.getoption('qt5reactor'):
-        reactor_fixture = qt5_reactor
-    else:
-        reactor_fixture = default_reactor
-
-    class ReactorPlugin(object):
-        reactor = staticmethod(
-            pytest.fixture(scope='session', autouse=True)(reactor_fixture)
-        )
-
-    config.pluginmanager.register(ReactorPlugin())
-
-
-@pytest.fixture(scope="session", autouse=True)
-def twisted_greenlet(request, reactor):
-    request.addfinalizer(stop_twisted_greenlet)
-    return gr_twisted
+def stop_twisted_greenlet():
+    if _instances.gr_twisted:
+        _instances.reactor.stop()
+        _instances.gr_twisted.switch()
 
 
 def _pytest_pyfunc_call(pyfuncitem):
@@ -140,7 +78,7 @@ def _pytest_pyfunc_call(pyfuncitem):
         return testfunction(*pyfuncitem._args)
     else:
         funcargs = pyfuncitem.funcargs
-        if hasattr(pyfuncitem, "_fixtureinfo"):
+        if hasattr(pyfuncitem, '_fixtureinfo'):
             testargs = {}
             for arg in pyfuncitem._fixtureinfo.argnames:
                 testargs[arg] = funcargs[arg]
@@ -150,18 +88,66 @@ def _pytest_pyfunc_call(pyfuncitem):
 
 
 def pytest_pyfunc_call(pyfuncitem):
-    if gr_twisted is not None:
-        if gr_twisted.dead:
-            raise RuntimeError("twisted reactor has stopped")
+    if _instances.gr_twisted is not None:
+        if _instances.gr_twisted.dead:
+            raise RuntimeError('twisted reactor has stopped')
 
         def in_reactor(d, f, *args):
             return defer.maybeDeferred(f, *args).chainDeferred(d)
 
         d = defer.Deferred()
-        reactor.callLater(0.0, in_reactor, d, _pytest_pyfunc_call, pyfuncitem)
+        _instances.reactor.callLater(
+            0.0, in_reactor, d, _pytest_pyfunc_call, pyfuncitem
+        )
         blockon_default(d)
     else:
-        if not reactor.running:
-            raise RuntimeError("twisted reactor is not running")
-        blockingCallFromThread(reactor, _pytest_pyfunc_call, pyfuncitem)
+        if not _instances.reactor.running:
+            raise RuntimeError('twisted reactor is not running')
+        blockingCallFromThread(
+            _instances.reactor, _pytest_pyfunc_call, pyfuncitem
+        )
     return True
+
+
+@pytest.fixture(scope="session", autouse=True)
+def twisted_greenlet(request, reactor):
+    request.addfinalizer(stop_twisted_greenlet)
+    return _instances.gr_twisted
+
+
+def init_reactor():
+    import twisted.internet.reactor
+    _instances.reactor = twisted.internet.reactor
+    init_twisted_greenlet()
+
+
+def init_qt5_reactor(qapp):
+    import qt5reactor
+    try:
+        qt5reactor.install()
+    except error.ReactorAlreadyInstalledError:
+        if not isinstance(_instances.reactor, qt5reactor.QtReactor):
+            stop_twisted_greenlet()
+            _instances.gr_twisted = None
+            del sys.modules['twisted.internet.reactor']
+            qt5reactor.install()
+    init_reactor()
+
+
+def pytest_addoption(parser):
+    group = parser.getgroup('twisted')
+    group.addoption('--qt5reactor', dest='qt5reactor', action='store_true',
+                    help='prepare for use with qt5reactor')
+
+
+def pytest_configure(config):
+    reactor_fixture = init_reactor
+    if config.getoption('qt5reactor'):
+        reactor_fixture = init_qt5_reactor
+
+    class ReactorPlugin(object):
+        reactor = staticmethod(
+            pytest.fixture(scope='session', autouse=True)(reactor_fixture)
+        )
+
+    config.pluginmanager.register(ReactorPlugin())

testing/test_basic.py

@@ -2,8 +2,6 @@
 
 import sys
 
-import pytest
-
 
 def test_fail_later(testdir):
     testdir.makepyfile("""
@@ -108,13 +106,13 @@ def test_MAIN():
     assert outcomes.get("passed") == 1
 
 
-@pytest.mark.skip
-def test_blocon_in_hook(testdir):
+def test_blockon_in_hook(testdir):
     testdir.makeconftest("""
         import pytest_twisted as pt
         from twisted.internet import reactor, defer
 
         def pytest_configure(config):
+            pt.init_reactor()
             d = defer.Deferred()
             reactor.callLater(0.01, d.callback, 1)
             pt.blockon(d)