Merge pull request #10 from vtitor/init-twisted-greenlet

Extract the twisted greenlet initialization to a separate function

Author: vtitor

.travis.yml

@@ -0,0 +1,10 @@
+language: python
+python:
+  - "2.7"
+  - "2.6"
+
+install:
+  - pip install tox
+  - export TOX_ENV=`tox --listenvs | grep "py${TRAVIS_PYTHON_VERSION/./}" | tr '\n' ','`
+
+script: tox -e $TOX_ENV

pytest_twisted/plugin.py

@@ -33,7 +33,19 @@ def inlineCallbacks(fun, *args, **kw):
 
 
 def pytest_namespace():
-    return dict(inlineCallbacks=inlineCallbacks, blockon=blockon)
+    return dict(
+        inlineCallbacks=inlineCallbacks,
+        blockon=blockon,
+        init_twisted_greenlet=init_twisted_greenlet
+    )
+
+
+def init_twisted_greenlet():
+    global gr_twisted
+    if not gr_twisted:
+        gr_twisted = greenlet.greenlet(reactor.run)
+        failure.Failure.cleanFailure = lambda self: None  # give me better tracebacks
+    return gr_twisted
 
 
 def stop_twisted_greenlet():
@@ -44,11 +56,8 @@ def stop_twisted_greenlet():
 
 @pytest.fixture(scope="session", autouse=True)
 def twisted_greenlet(request):
-    global gr_twisted
-    gr_twisted = greenlet.greenlet(reactor.run)
-    failure.Failure.cleanFailure = lambda self: None  # give me better tracebacks
     request.addfinalizer(stop_twisted_greenlet)
-    return gr_twisted
+    return init_twisted_greenlet()
 
 
 def _pytest_pyfunc_call(pyfuncitem):

tox.ini

@@ -9,6 +9,13 @@ deps=pytest
 commands=py.test []
 sitepackages=False
 
+[testenv:py26]
+deps=pytest<3.3
+     greenlet
+     twisted<15.5
+commands=py.test []
+sitepackages=False
+
 [testenv:py25]
 deps=pytest
      greenlet