Tweak a timing-sensitive test to have fewer false failures.

diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py
index e7d6a7392f93df347e832d09b1c121788420c065..b030185725d124865f161501e15194d0ffffa424 100644 (file)
--- a/tornado/test/testing_test.py
+++ b/tornado/test/testing_test.py
@@ -20,10 +20,10 @@ class AsyncTestCaseTest(AsyncTestCase, LogTrapTestCase):
         This test makes sure that a second call to wait()
         clears the first timeout.
         """
-        self.io_loop.add_timeout(time.time() + 0.001, self.stop)
-        self.wait(timeout = 0.002)
-        self.io_loop.add_timeout(time.time() + 0.003, self.stop)
-        self.wait(timeout = 0.01)
+        self.io_loop.add_timeout(time.time() + 0.01, self.stop)
+        self.wait(timeout = 0.02)
+        self.io_loop.add_timeout(time.time() + 0.03, self.stop)
+        self.wait(timeout = 0.1)
 
 class SetUpTearDownTest(unittest.TestCase):
     def test_set_up_tear_down(self):

diff --git a/tornado/testing.py b/tornado/testing.py
index b06d149c17a238de7f1557d76515b94b2a84d5fc..5484e0ebd891f8a047118741fdf0b352ae2ede43 100644 (file)
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -184,7 +184,7 @@ class AsyncTestCase(unittest.TestCase):
                 def timeout_func():
                     try:
                         raise self.failureException(
-                          'Async operation timed out after %d seconds' %
+                          'Async operation timed out after %s seconds' %
                           timeout)
                     except Exception:
                         self.__failure = sys.exc_info()