install reactor earlier, in pytest_configure hook

Author: ybilopolov

pytest_twisted.py

@@ -120,7 +120,7 @@ def in_reactor(d, f, *args):
 
 
 @pytest.fixture(scope="session", autouse=True)
-def twisted_greenlet(request, reactor):
+def twisted_greenlet(request):
     request.addfinalizer(stop_twisted_greenlet)
     return _instances.gr_twisted
 
@@ -144,7 +144,7 @@ def init_default_reactor():
     )
 
 
-def init_qt5_reactor(qapp):
+def init_qt5_reactor():
     import qt5reactor
 
     _install_reactor(
@@ -153,18 +153,12 @@ def init_qt5_reactor(qapp):
     )
 
 
-_reactor_fixtures = {
+_reactor_installers = {
     'default': init_default_reactor,
     'qt5reactor': init_qt5_reactor,
 }
 
 
-def _init_reactor():
-    import twisted.internet.reactor
-    _instances.reactor = twisted.internet.reactor
-    init_twisted_greenlet()
-
-
 def _install_reactor(reactor_installer, reactor_type):
     try:
         reactor_installer()
@@ -177,24 +171,19 @@ def _install_reactor(reactor_installer, reactor_type):
                     type(twisted.internet.reactor),
                 )
             )
-    _init_reactor()
+    import twisted.internet.reactor
+    _instances.reactor = twisted.internet.reactor
+    init_twisted_greenlet()
 
 
 def pytest_addoption(parser):
     group = parser.getgroup('twisted')
     group.addoption(
         '--reactor',
         default='default',
-        choices=tuple(_reactor_fixtures.keys()),
+        choices=tuple(_reactor_installers.keys()),
     )
 
 
 def pytest_configure(config):
-    reactor_fixture = _reactor_fixtures[config.getoption('reactor')]
-
-    class ReactorPlugin(object):
-        reactor = staticmethod(
-            pytest.fixture(scope='session', autouse=True)(reactor_fixture)
-        )
-
-    config.pluginmanager.register(ReactorPlugin())
+    _reactor_installers[config.getoption('reactor')]()

testing/test_basic.py

@@ -198,16 +198,17 @@ def test_succeed():
 
 @skip_if_reactor_not('default')
 def test_wrong_reactor(testdir, cmd_opts):
-    testdir.makepyfile("""
+    testdir.makeconftest("""
+    def pytest_addhooks():
         import twisted.internet.reactor
         twisted.internet.reactor = None
-
+    """)
+    testdir.makepyfile("""
         def test_succeed():
             pass
     """)
     rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
-    assert 'WrongReactorAlreadyInstalledError' in rr.stdout.str()
-    assert_outcomes(rr, {'error': 1})
+    assert 'WrongReactorAlreadyInstalledError' in rr.stderr.str()
 
 
 @skip_if_reactor_not('qt5reactor')
@@ -219,9 +220,7 @@ def test_blockon_in_hook_with_qt5reactor(testdir, cmd_opts):
 
 
     def pytest_configure(config):
-        qapp = pytestqt.plugin.qapp(pytestqt.plugin.qapp_args())
-
-        pt.init_qt5_reactor(qapp)
+        pt.init_qt5_reactor()
         d = defer.Deferred()
 
         from twisted.internet import reactor
@@ -242,16 +241,18 @@ def test_succeed():
 
 @skip_if_reactor_not('qt5reactor')
 def test_wrong_reactor_with_qt5reactor(testdir, cmd_opts):
-    testdir.makepyfile("""
+    testdir.makeconftest("""
+    def pytest_addhooks():
         import twisted.internet.default
         twisted.internet.default.install()
-
+    """)
+    testdir.makepyfile("""
         def test_succeed():
             pass
     """)
     rr = testdir.run(sys.executable, "-m", "pytest", "-v", *cmd_opts)
-    assert 'WrongReactorAlreadyInstalledError' in rr.stdout.str()
-    assert_outcomes(rr, {'error': 1})
+    assert 'WrongReactorAlreadyInstalledError' in rr.stderr.str()
+    # assert_outcomes(rr, {'error': 1})
 
 
 @skip_if_reactor_not('default')