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

bdarnell · Apr 19, 2012 · 4e98959 · 4e98959
1 parent 38908bf
commit 4e98959
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py
@@ -20,10 +20,10 @@ def test_subsequent_wait_calls(self):
         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
@@ -184,7 +184,7 @@ def wait(self, condition=None, timeout=5):
                 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()