Merge branch 'deprecate_pytest_namespace' into qt5reactor

Author: altendky

.travis.yml

@@ -2,6 +2,9 @@ language: python
 python:
   - "2.7"
   - "2.6"
+  - "3.4"
+  - "3.5"
+  - "3.6"
 
 install:
   - pip install tox

README.rst

@@ -34,22 +34,22 @@ inlineCallbacks
 =================
 Using `twisted.internet.defer.inlineCallbacks` as a decorator for test
 functions, which take funcargs, does not work. Please use
-`pytest.inlineCallbacks` instead::
+`pytest_twisted.inlineCallbacks` instead::
 
-  @pytest.inlineCallbacks
+  @pytest_twisted.inlineCallbacks
   def test_some_stuff(tmpdir):
       res = yield threads.deferToThread(os.listdir, tmpdir.strpath)
       assert res == []
 
 Waiting for deferreds in fixtures
 =================================
-`pytest.blockon` allows fixtures to wait for deferreds::
+`pytest_twisted.blockon` allows fixtures to wait for deferreds::
 
   @pytest.fixture
   def val():
       d = defer.Deferred()
       reactor.callLater(1.0, d.callback, 10)
-      return pytest.blockon(d)
+      return pytest_twisted.blockon(d)
 
 
 The twisted greenlet

pytest_twisted.py

@@ -12,6 +12,13 @@
 
 
 def blockon(d):
+    if 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"
@@ -45,7 +52,7 @@ def inlineCallbacks(fun, *args, **kw):
 
 def pytest_namespace():
     return dict(inlineCallbacks=inlineCallbacks,
-                blockon=block_from_thread if reactor.running else blockon)
+                blockon=blockon)
 
 
 def stop_twisted_greenlet():
@@ -148,7 +155,7 @@ def in_reactor(d, f, *args):
 
         d = defer.Deferred()
         reactor.callLater(0.0, in_reactor, d, _pytest_pyfunc_call, pyfuncitem)
-        blockon(d)
+        blockon_default(d)
     else:
         if not reactor.running:
             raise RuntimeError("twisted reactor is not running")

testing/test_basic.py

@@ -63,14 +63,15 @@ def test_inlineCallbacks(testdir):
     testdir.makepyfile("""
         from twisted.internet import reactor, defer
         import pytest
+        import pytest_twisted
 
         @pytest.fixture(scope="module",
                         params=["fs", "imap", "web"])
         def foo(request):
             return request.param
 
 
-        @pytest.inlineCallbacks
+        @pytest_twisted.inlineCallbacks
         def test_succeed(foo):
             yield defer.succeed(foo)
             if foo == "web":
@@ -107,13 +108,13 @@ def test_MAIN():
 
 def test_blocon_in_hook(testdir):
     testdir.makeconftest("""
-        import pytest
+        import pytest_twisted as pt
         from twisted.internet import reactor, defer
 
         def pytest_configure(config):
             d = defer.Deferred()
             reactor.callLater(0.01, d.callback, 1)
-            pytest.blockon(d)
+            pt.blockon(d)
     """)
     testdir.makepyfile("""
         from twisted.internet import reactor, defer
@@ -131,18 +132,19 @@ def test_succeed():
 def test_pytest_from_reactor_thread(testdir):
     testdir.makepyfile("""
         import pytest
+        import pytest_twisted
         from twisted.internet import reactor, defer
 
         @pytest.fixture
         def fix():
             d = defer.Deferred()
             reactor.callLater(0.01, d.callback, 42)
-            return pytest.blockon(d)
+            return pytest_twisted.blockon(d)
 
         def test_simple(fix):
             assert fix == 42
 
-        @pytest.inlineCallbacks
+        @pytest_twisted.inlineCallbacks
         def test_fail():
             d = defer.Deferred()
             reactor.callLater(0.01, d.callback, 1)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26,py27,linting
+envlist = py{26,27,34,35,36},linting
 
 
 [testenv]