From: A. Jesse Jiryu Davis Date: Fri, 30 Jan 2015 20:08:08 +0000 (-0500) Subject: Use self.io_loop in with_timeout tests. X-Git-Tag: v4.1.0b2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2716458415d37e0ce8ea9a02272992253f49da63;p=thirdparty%2Ftornado.git Use self.io_loop in with_timeout tests. --- diff --git a/tornado/test/gen_test.py b/tornado/test/gen_test.py index efc48644a..5d646d150 100644 --- a/tornado/test/gen_test.py +++ b/tornado/test/gen_test.py @@ -1036,7 +1036,7 @@ class WithTimeoutTest(AsyncTestCase): self.io_loop.add_timeout(datetime.timedelta(seconds=0.1), lambda: future.set_result('asdf')) result = yield gen.with_timeout(datetime.timedelta(seconds=3600), - future) + future, io_loop=self.io_loop) self.assertEqual(result, 'asdf') @gen_test @@ -1046,14 +1046,15 @@ class WithTimeoutTest(AsyncTestCase): datetime.timedelta(seconds=0.1), lambda: future.set_exception(ZeroDivisionError())) with self.assertRaises(ZeroDivisionError): - yield gen.with_timeout(datetime.timedelta(seconds=3600), future) + yield gen.with_timeout(datetime.timedelta(seconds=3600), + future, io_loop=self.io_loop) @gen_test def test_already_resolved(self): future = Future() future.set_result('asdf') result = yield gen.with_timeout(datetime.timedelta(seconds=3600), - future) + future, io_loop=self.io_loop) self.assertEqual(result, 'asdf') @unittest.skipIf(futures is None, 'futures module not present')