init reactor greenlet earlier

pytest_twisted.py

@@ -33,11 +33,7 @@ def inlineCallbacks(fun, *args, **kw):
 
 
 def pytest_namespace():
-    return dict(
-        inlineCallbacks=inlineCallbacks,
-        blockon=blockon,
-        init_twisted_greenlet=init_twisted_greenlet
-    )
+    return dict(inlineCallbacks=inlineCallbacks, blockon=blockon)
 
 
 def init_twisted_greenlet():
@@ -54,10 +50,14 @@ def stop_twisted_greenlet():
         gr_twisted.switch()
 
 
+def pytest_addhooks(pluginmanager):
+    init_twisted_greenlet()
+
+
 @pytest.fixture(scope="session", autouse=True)
 def twisted_greenlet(request):
     request.addfinalizer(stop_twisted_greenlet)
-    return init_twisted_greenlet()
+    return gr_twisted
 
 
 def _pytest_pyfunc_call(pyfuncitem):

testing/test_basic.py

@@ -5,77 +5,77 @@
 
 def test_fail_later(testdir):
     testdir.makepyfile("""
-from twisted.internet import reactor, defer
-
-def test_fail():
-    def doit():
-        try:
-            1 / 0
-        except:
-            d.errback()
-
-    d = defer.Deferred()
-    reactor.callLater(0.01, doit)
-    return d
-""")
+        from twisted.internet import reactor, defer
+        
+        def test_fail():
+            def doit():
+                try:
+                    1 / 0
+                except:
+                    d.errback()
+        
+            d = defer.Deferred()
+            reactor.callLater(0.01, doit)
+            return d
+    """)
     rr = testdir.run(sys.executable, "-m", "pytest")
     outcomes = rr.parseoutcomes()
     assert outcomes.get("failed") == 1
 
 
 def test_succeed_later(testdir):
     testdir.makepyfile("""
-from twisted.internet import reactor, defer
-
-def test_succeed():
-    d = defer.Deferred()
-    reactor.callLater(0.01, d.callback, 1)
-    return d
-""")
+        from twisted.internet import reactor, defer
+        
+        def test_succeed():
+            d = defer.Deferred()
+            reactor.callLater(0.01, d.callback, 1)
+            return d
+    """)
     rr = testdir.run(sys.executable, "-m", "pytest")
     outcomes = rr.parseoutcomes()
     assert outcomes.get("passed") == 1
 
 
 def test_non_deferred(testdir):
     testdir.makepyfile("""
-from twisted.internet import reactor, defer
-
-def test_succeed():
-    return 42
-""")
+        from twisted.internet import reactor, defer
+        
+        def test_succeed():
+            return 42
+    """)
     rr = testdir.run(sys.executable, "-m", "pytest")
     outcomes = rr.parseoutcomes()
     assert outcomes.get("passed") == 1
 
 
 def test_exception(testdir):
     testdir.makepyfile("""
-def test_more_fail():
-    raise RuntimeError("foo")
-""")
+        def test_more_fail():
+            raise RuntimeError("foo")
+    """)
     rr = testdir.run(sys.executable, "-m", "pytest")
     outcomes = rr.parseoutcomes()
     assert outcomes.get("failed") == 1
 
 
 def test_inlineCallbacks(testdir):
     testdir.makepyfile("""
-from twisted.internet import reactor, defer
-import pytest
-
-@pytest.fixture(scope="module",
-                params=["fs", "imap", "web"])
-def foo(request):
-    return request.param
-
-
-@pytest.inlineCallbacks
-def test_succeed(foo):
-    yield defer.succeed(foo)
-    if foo == "web":
-        raise RuntimeError("baz")
-""")
+        from twisted.internet import reactor, defer
+        import pytest
+        
+        @pytest.fixture(scope="module",
+                        params=["fs", "imap", "web"])
+        def foo(request):
+            return request.param
+        
+        
+        @pytest.inlineCallbacks
+        def test_succeed(foo):
+            yield defer.succeed(foo)
+            if foo == "web":
+                raise RuntimeError("baz")
+    """)
     rr = testdir.run(sys.executable, "-m", "pytest", "-v")
     outcomes = rr.parseoutcomes()
     assert outcomes.get("passed") == 2
@@ -84,22 +84,45 @@ def test_succeed(foo):
 
 def test_twisted_greenlet(testdir):
     testdir.makepyfile("""
-import pytest, greenlet
-
-MAIN = None
-
-
-@pytest.fixture(scope="session", autouse=True)
-def set_MAIN(request, twisted_greenlet):
-    global MAIN
-    MAIN = twisted_greenlet
-
+        import pytest, greenlet
+
+        MAIN = None
+
+
+        @pytest.fixture(scope="session", autouse=True)
+        def set_MAIN(request, twisted_greenlet):
+            global MAIN
+            MAIN = twisted_greenlet
+
+
+        def test_MAIN():
+            assert MAIN is not None
+            assert MAIN is greenlet.getcurrent()
+
+    """)
+    rr = testdir.run(sys.executable, "-m", "pytest", "-v")
+    outcomes = rr.parseoutcomes()
+    assert outcomes.get("passed") == 1
 
-def test_MAIN():
-    assert MAIN is not None
-    assert MAIN is greenlet.getcurrent()
 
-""")
+def test_blocon_in_hook(testdir):
+    testdir.makeconftest("""
+        import pytest
+        from twisted.internet import reactor, defer
+
+        def pytest_configure(config):
+            d = defer.Deferred()
+            reactor.callLater(0.01, d.callback, 1)
+            pytest.blockon(d)
+    """)
+    testdir.makepyfile("""
+        from twisted.internet import reactor, defer
+
+        def test_succeed():
+            d = defer.Deferred()
+            reactor.callLater(0.01, d.callback, 1)
+            return d
+    """)
     rr = testdir.run(sys.executable, "-m", "pytest", "-v")
     outcomes = rr.parseoutcomes()
     assert outcomes.get("passed") == 1