twisted: Be more tolerant of leaked current IOLoops in tests

diff --git a/tornado/platform/twisted.py b/tornado/platform/twisted.py
index 613e7b6dccad65bba217d05155ee1418206ac673..f8d32193ea243e6c256eea37d58230d4a4ef30e2 100644 (file)
--- a/tornado/platform/twisted.py
+++ b/tornado/platform/twisted.py
@@ -317,6 +317,7 @@ class _TestReactor(TornadoReactor):
     """
     def __init__(self):
         # always use a new ioloop
+        IOLoop.clear_current()
         IOLoop(make_current=True)
         super(_TestReactor, self).__init__()
         IOLoop.clear_current()

diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py
index c0a243a9bbe6852900a24e640e097f252e2eed8b..1d75904a4321bd1b2c9e69b61e7d6ebbf5f90b6d 100644 (file)
--- a/tornado/test/twisted_test.py
+++ b/tornado/test/twisted_test.py
@@ -94,6 +94,7 @@ def restore_signal_handlers(saved):
 class ReactorTestCase(unittest.TestCase):
     def setUp(self):
         self._saved_signals = save_signal_handlers()
+        IOLoop.clear_current()
         self._io_loop = IOLoop(make_current=True)
         self._reactor = TornadoReactor()
         IOLoop.clear_current()