From: A. Jesse Jiryu Davis Date: Sat, 13 Apr 2013 18:29:22 +0000 (-0400) Subject: testing_test style cleanup X-Git-Tag: v3.1.0~106^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=526f94e50bd40c60a566be2a3b9079d2401209ee;p=thirdparty%2Ftornado.git testing_test style cleanup --- diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py index 5b1ddbd02..81455dfe0 100644 --- a/tornado/test/testing_test.py +++ b/tornado/test/testing_test.py @@ -112,10 +112,9 @@ class GenTest(AsyncTestCase): self.finished = True def test_timeout_environment_variable(self): - time = self.io_loop.time - @gen_test(timeout=0.5) def test_long_timeout(self): + time = self.io_loop.time yield gen.Task(self.io_loop.add_timeout, time() + 0.25) # Uses provided timeout of 0.5 seconds, doesn't time out. @@ -125,10 +124,9 @@ class GenTest(AsyncTestCase): self.finished = True def test_no_timeout_environment_variable(self): - time = self.io_loop.time - @gen_test(timeout=0.01) def test_short_timeout(self): + time = self.io_loop.time yield gen.Task(self.io_loop.add_timeout, time() + 1) # Uses environment TIMEOUT of 0.1, times out.