From 2b9f7925d3f5d4d1d61f7078cd4f3e5638d98fc7 Mon Sep 17 00:00:00 2001
From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 7 Jan 2014 01:14:37 -0500
Subject: [PATCH] Add trollius (py2 backport of asyncio) to tox config.

This passes the twisted integration tests but currently has some issues
with pycurl.
---
 tornado/platform/asyncio.py  |  5 ++++-
 tornado/test/twisted_test.py |  5 ++---
 tox.ini                      | 15 ++++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/tornado/platform/asyncio.py b/tornado/platform/asyncio.py
index bc5c2f27..162b3673 100644
--- a/tornado/platform/asyncio.py
+++ b/tornado/platform/asyncio.py
@@ -36,7 +36,10 @@ class BaseAsyncIOLoop(IOLoop):
         for fd in list(self.handlers):
             self.remove_handler(fd)
             if all_fds:
-                os.close(fd)
+                try:
+                    os.close(fd)
+                except OSError:
+                    pass
         if self.close_loop:
             self.asyncio_loop.close()
 
diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py
index 003b539d..2922a61e 100644
--- a/tornado/test/twisted_test.py
+++ b/tornado/test/twisted_test.py
@@ -470,9 +470,8 @@ if have_twisted:
         'twisted.internet.test.test_core.ObjectModelIntegrationTest': [],
         'twisted.internet.test.test_core.SystemEventTestsBuilder': [
             'test_iterate',  # deliberately not supported
-            'test_runAfterCrash',  # fails because TwistedIOLoop uses the global reactor
-        ] if issubclass(IOLoop.configured_class(), TwistedIOLoop) else [
-            'test_iterate',  # deliberately not supported
+            # Fails on TwistedIOLoop and AsyncIOLoop.
+            'test_runAfterCrash',
         ],
         'twisted.internet.test.test_fdset.ReactorFDSetTestsBuilder': [
             "test_lostFileDescriptor",  # incompatible with epoll and kqueue
diff --git a/tox.ini b/tox.ini
index 5c68e8ec..43756b72 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,8 @@
 [tox]
 # "-full" variants include optional dependencies, to ensure
 # that things work both in a bare install and with all the extras.
-envlist = py27-full, py27-curl, py32-full, pypy, py26, py26-full, py27, py32, py32-utf8, py33, py27-opt, py32-opt, pypy-full, py27-select, py27-monotonic, py33-monotonic, py33-asyncio, py27-twisted, py27-threadedresolver, py27-twistedresolver, py27-twistedlayered, py27-caresresolver, py32-caresresolver, py27-locale, py27-docs
+envlist = py27-full, py27-curl, py32-full, pypy, py26, py26-full, py27, py32, py32-utf8, py33, py27-opt, py32-opt, pypy-full, py27-select, py27-monotonic, py33-monotonic, py33-asyncio, py27-twisted, py27-threadedresolver, py27-twistedresolver, py27-twistedlayered, py27-caresresolver, py32-caresresolver, py27-locale, py27-trollius, py27-docs
+
 [testenv]
 commands = python -m tornado.test.runtests {posargs:}
 
@@ -207,6 +208,18 @@ deps =
      twisted>=12.0.0
 commands = python -O -m tornado.test.runtests {posargs:}
 
+# Trollius is the py2.7 backport of asyncio.
+[testenv:py27-trollius]
+basepython = python2.7
+commands = python -m tornado.test.runtests --ioloop=tornado.platform.asyncio.AsyncIOLoop {posargs:}
+# Pycurl tests currently fail with trollius.
+deps =
+     futures
+     mock
+     # pycurl
+     trollius>=0.1.1
+     twisted
+
 [testenv:py32-opt]
 basepython = python3.2
 commands = python -O -m tornado.test.runtests {posargs:}