From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 3 Jun 2012 20:28:44 +0000 (-0700)
Subject: Set alarms on child processes in process_test.
X-Git-Tag: v2.4.0~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3451019e2ba44a285495d52029e6398ac88d2f9f;p=thirdparty%2Ftornado.git

Set alarms on child processes in process_test.

These alarms used to be there, but got dropped in a previous change
because I had assumed the child processes would inherit the parent's
alarm.
---

diff --git a/tornado/test/process_test.py b/tornado/test/process_test.py
index 04bcf161d..9f7ecf2cf 100644
--- a/tornado/test/process_test.py
+++ b/tornado/test/process_test.py
@@ -57,9 +57,11 @@ class ProcessTest(LogTrapTestCase):
             return "http://127.0.0.1:%d%s" % (port, path)
         sockets = bind_sockets(port, "127.0.0.1")
         # ensure that none of these processes live too long
-        signal.alarm(5)
+        signal.alarm(5)  # master process
         try:
             id = fork_processes(3, max_restarts=3)
+            assert id is not None
+            signal.alarm(5)  # child processes
         except SystemExit, e:
             # if we exit cleanly from fork_processes, all the child processes
             # finished with status 0