Make os.waitpid timeout on Windows.

scripts/slave/recipe_modules/goma/resources/cloudtail_utils.py

 #!/usr/bin/env python
 # Copyright (c) 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import errno
+import multiprocessing
 import os
 import signal
 import subprocess
 import sys
 import time
 
 from slave import goma_utils
 
 
 def start_cloudtail(args):
@@ skipping 24 matching lines @@
 
   try:
     os.kill(pid, 0)
   except OSError as e:
     if e.errno == errno.ESRCH or e.errno == errno.EPERM:
       return False
     raise e
   return True
 
 
+def waitpid_for_win(pid):
+  """Return exception if raised in os.waitpid, or None.
+
+  Args:
+    pid(int): pid of process which this function checks
+              whether it is running or not.
+
+  Returns:
+    Exception: if something raised in os.waitpid.

[tikuta, 2016/10/21 02:35:04]

nit: I prefer to use 'If' here or use 'otherwise' below.

[Yoshisato Yanagisawa, 2016/10/21 02:38:15]

good catch.

+    None: Otherwise.
+  """
+  try:
+    os.waitpid(pid, 0)
+  except Exception as e:
+    return e
+  return None
+
+
 class NotDiedError(Exception):
   def __str__(self):
     return "NotDiedError"
 
 
 def wait_termination(pid):
   """Send SIGINT to pid and wait termination of pid.
 
   Args:
     pid(int): pid of process which this function waits termination.
 
   Raises:
     OSError: is_running_posix, os.waitpid and os.kill may throw OSError.
     NotDiedError: if cloudtail is running after 10 seconds waiting,
                   NotDiedError is raised.
   """
   try:
     os.kill(pid, signal.SIGINT)
   except OSError as e:
     # Already dead?
     if e.errno in (errno.ECHILD, errno.EPERM, errno.ESRCH):
       return
     raise
 
   print('SIGINT has been sent to process %d. '
         'Going to wait for the process finishes.' % pid)
   if os.name == 'nt':
+    pool = multiprocessing.Pool(1)
+    res = pool.apply_async(waitpid_for_win)
     try:
-      os.waitpid(pid, 0)
-    except OSError as e:
-      if e.errno == errno.ECHILD:
+      e = res.get(10)
+    except multiprocessing.TimeoutError:
+      print('process %d running more than 10 seconds' % pid)
+      raise NotDiedError()
+    if e is None:
+      return
+    if isinstance(e, OSError) and e.errno == errno.ECHILD:
         print('process %d died before waitpitd' % pid)
         return
-      raise e
+    raise e
   else:
     for _ in xrange(10):
       time.sleep(1)
       if not is_running_posix(pid):
         return
 
     print('process %d running more than 10 seconds' % pid)
     raise NotDiedError()
 
 
@@ skipping 34 matching lines @@
       try:
         os.kill(pid, signal.SIGTERM)
       except OSError as e:
         print('Failed to send SIGTERM to process %d: %s' % (pid, e))
       # We do not reraise because I believe not suspending the process
       # is more important than completely killing cloudtail.
 
 
 if '__main__' == __name__:
   sys.exit(main())