init_reactor() -> init_default_reactor() and do reactor type checking

Author: altendky

pytest_twisted.py

@@ -1,3 +1,5 @@
+import inspect
+
 import decorator
 import greenlet
 import pytest
@@ -117,26 +119,53 @@ def twisted_greenlet(request, reactor):
     return _instances.gr_twisted
 
 
-def init_reactor():
+def init_default_reactor():
+    import twisted.internet.default
+
+    module = inspect.getmodule(twisted.internet.default.install)
+
+    module_name = module.__name__.split('.')[-1]
+    reactor_type_name, = (
+        x
+        for x in dir(module)
+        if x.lower() == module_name
+    )
+    reactor_type = getattr(module, reactor_type_name)
+
+    _install_reactor(
+        reactor_installer=twisted.internet.default.install,
+        reactor_type=reactor_type,
+    )
+
+
+def init_qt5_reactor(qapp):
+    import qt5reactor
+
+    _install_reactor(
+        reactor_installer=qt5reactor.install,
+        reactor_type=qt5reactor.QtReactor,
+    )
+
+
+def _init_reactor():
     import twisted.internet.reactor
     _instances.reactor = twisted.internet.reactor
     init_twisted_greenlet()
 
 
-def init_qt5_reactor(qapp):
-    import qt5reactor
+def _install_reactor(reactor_installer, reactor_type):
     try:
-        qt5reactor.install()
+        reactor_installer()
     except error.ReactorAlreadyInstalledError:
         import twisted.internet.reactor
-        if not isinstance(twisted.internet.reactor, qt5reactor.QtReactor):
+        if not isinstance(twisted.internet.reactor, reactor_type):
             raise WrongReactorAlreadyInstalledError(
                 'expected {0} but found {1}'.format(
-                    qt5reactor.QtReactor,
+                    reactor_type,
                     type(twisted.internet.reactor),
                 )
             )
-    init_reactor()
+    _init_reactor()
 
 
 def pytest_addoption(parser):
@@ -150,7 +179,7 @@ def pytest_addoption(parser):
 
 def pytest_configure(config):
     reactor_fixture = {
-        'default': init_reactor,
+        'default': init_default_reactor,
         'qt5reactor': init_qt5_reactor,
     }[config.getoption('reactor')]
 

testing/test_basic.py

@@ -145,7 +145,7 @@ def test_blockon_in_hook(testdir):
         from twisted.internet import reactor, defer
 
         def pytest_configure(config):
-            pt.init_reactor()
+            pt.init_default_reactor()
             d = defer.Deferred()
             reactor.callLater(0.01, d.callback, 1)
             pt.blockon(d)
@@ -162,6 +162,20 @@ def test_succeed():
     assert_outcomes(rr, {'passed': 1})
 
 
+@skip_if_reactor_not('default')
+def test_wrong_reactor(testdir):
+    testdir.makepyfile("""
+        import twisted.internet.reactor
+        twisted.internet.reactor = None
+
+        def test_succeed():
+            pass
+    """)
+    rr = testdir.run(sys.executable, "-m", "pytest", "-v")
+    assert 'WrongReactorAlreadyInstalledError' in rr.stdout.str()
+    assert_outcomes(rr, {'error': 1})
+
+
 @skip_if_reactor_not('qt5reactor')
 def test_blockon_in_hook_with_qt5reactor(testdir):
     testdir.makeconftest("""