Merge pull request #108 from codeskyblue/fix-tornado5

fix tornado 5.0 with_timeout error

Author: gabor-boros

.travis.yml

@@ -14,6 +14,7 @@ allow_failure:
 
 install:
     - pip install -r requirements.txt
+    - pip install -r requirements-dev.txt
 
 before_script:
     - make prepare

requirements-dev.txt

@@ -0,0 +1,2 @@
+tornado>=5.0
+pytest-tornasync; python_version >= '3.5'

rethinkdb/tornado_net/net_tornado.py

@@ -128,7 +128,6 @@ def connect(self, timeout):
             self._stream = yield with_absolute_timeout(
                 deadline,
                 stream_future,
-                io_loop=self._io_loop,
                 quiet_exceptions=(iostream.StreamClosedError))
         except Exception as err:
             raise ReqlDriverError('Could not connect to %s:%s. Error: %s' %
@@ -152,7 +151,6 @@ def connect(self, timeout):
                 response = yield with_absolute_timeout(
                     deadline,
                     self._stream.read_until(b'\0'),
-                    io_loop=self._io_loop,
                     quiet_exceptions=(iostream.StreamClosedError))
                 response = response[:-1]
         except ReqlAuthError:

tests/conftest.py

@@ -1,9 +1,12 @@
 import sys
 
 collect_ignore = []
-if sys.version_info < (3, 4):
-    collect_ignore += ["integration/test_asyncio.py", "integration/test_asyncio_coroutine.py"]
-elif sys.version_info < (3, 6):
-    collect_ignore.append("integration/test_asyncio.py")
+
 if sys.version_info < (3, 6):
-    collect_ignore.append("integration/test_trio.py")
+    collect_ignore += [
+        "integration/test_asyncio.py",
+        "integration/test_asyncio_coroutine.py",
+        "integration/test_tornado.py",
+        "integration/test_trio.py",
+    ]
+    

tests/integration/test_tornado.py

@@ -0,0 +1,27 @@
+import os
+import sys
+from collections import namedtuple
+import pytest
+from rethinkdb import RethinkDB
+from rethinkdb.errors import ReqlRuntimeError
+
+Helper = namedtuple("Helper", "r connection")
+
+INTEGRATION_TEST_DB = 'integration_test'
+
+
+@pytest.mark.integration
+@pytest.mark.skipif(sys.version_info < (3, 6), reason="requires python3.6 or higher")
+async def test_tornado_connect(io_loop):
+    """
+    Test the flow for 3.6 and up, async generators are
+    not supported in 3.5.
+    """
+
+    r = RethinkDB()
+    r.set_loop_type("tornado")
+
+    connection = await r.connect(os.getenv("REBIRTHDB_HOST"))
+    dbs = await r.db_list().run(connection)
+    assert isinstance(dbs, list)
+    await connection.close()