Merge pull request #294 from asottile/test_newer_tornado

Work with newer tornado. Refs #283
Yelp · Oct 27, 2014 · f2168b7 · f2168b7
2 parents 3f23508 + 81027a5
commit f2168b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
         "Intended Audience :: Developers",
         "Development Status :: 4 - Beta",
     ],
-    install_requires=['Mock', 'PyYaml', 'SQLAlchemy', 'Tornado<2.0.0'],
+    install_requires=['Mock', 'PyYaml', 'SQLAlchemy', 'Tornado'],
     packages=["testify", "testify.contrib", "testify.utils", "testify.plugins"],
     scripts=['bin/testify'],
     long_description="""Testify - A Testing Framework

diff --git a/testify/test_runner_server.py b/testify/test_runner_server.py
@@ -471,7 +471,8 @@ def shutdown(self):
 
         # Without this check, we could end up queueing a stop() call on a
         # tornado server we spin up later, causing it to hang mysteriously.
-        if iol.running():
+        # XXX: accessing private for tornado2+3 compatibility
+        if iol._running:
             if self.runners_outstanding:
                 # Stop in 5 seconds if all the runners_outstanding don't come back by then.
                 iol.add_timeout(time.time()+self.shutdown_delay_for_outstanding_runners, iol.stop)