From: Ben Darnell Date: Sat, 20 Jun 2020 16:52:44 +0000 (-0400) Subject: test: Use default timeouts in sigchild test X-Git-Tag: v6.1.0b1~20^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2880%2Fhead;p=thirdparty%2Ftornado.git test: Use default timeouts in sigchild test The 1s timeout used here has become flaky with the introduction of a sleep (before the timeout even starts). --- diff --git a/tornado/test/process_test.py b/tornado/test/process_test.py index 1f2992024..2178b34f7 100644 --- a/tornado/test/process_test.py +++ b/tornado/test/process_test.py @@ -235,7 +235,7 @@ class SubprocessTest(AsyncTestCase): os.kill(subproc.pid, signal.SIGTERM) try: - ret = self.wait(timeout=1.0) + ret = self.wait() except AssertionError: # We failed to get the termination signal. This test is # occasionally flaky on pypy, so try to get a little more @@ -246,7 +246,7 @@ class SubprocessTest(AsyncTestCase): fut = subproc.stdout.read_until_close() fut.add_done_callback(lambda f: self.stop()) # type: ignore try: - self.wait(timeout=1.0) + self.wait() except AssertionError: raise AssertionError("subprocess failed to terminate") else: