Fix pyauto flakiness by waiting for notification that the renderer process'

chrome/test/pyautolib/pyauto.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 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.
 
 """PyAuto: Python Interface to Chromium's Automation Proxy.
 
 PyAuto uses swig to expose Automation Proxy interfaces to Python.
 For complete documentation on the functionality available,
@@ skipping 237 matching lines @@
     contents = open(data_file).read()
     try:
       ret = eval(contents, {'__builtins__': None}, None)
     except:
       print >>sys.stderr, '%s is an invalid data file.' % data_file
       raise
     return ret
 
   @staticmethod
   def Kill(pid):
-    """Terminate the given pid."""
+    """Terminate the given pid.
+
+    If the pid refers to a renderer, use KillRendererProcess instead.
+    """
     if PyUITest.IsWin():
       subprocess.call(['taskkill.exe', '/T', '/F', '/PID', str(pid)])
     else:
       os.kill(pid, signal.SIGTERM)
 
   def GetPrivateInfo(self):
     """Fetch info from private_tests_info.txt in private dir.
 
     Returns:
       a dictionary of items from private_tests_info.txt
@@ skipping 1690 matching lines @@
     """
     cmd_dict = {
       'command': 'GetNTPInfo',
     }
     return self._GetResultFromJSONRequest(cmd_dict)
 
   def _CheckNTPThumbnailShown(self, thumbnail):
     if self.GetNTPThumbnailIndex(thumbnail) == -1:
       raise NTPThumbnailNotShownError()
 
+  def KillRendererProcess(self, pid):
+    """Kills the given renderer process.
+
+    This will return only after the browser has received notice of the renderer
+    close.
+
+    Args:
+      pid: the process id of the renderer to kill
+
+    Raises:
+      pyauto_errors.JSONInterfaceError if the automation call returns an error.
+    """
+    cmd_dict = {
+        'command': 'KillRendererProcess',
+        'pid': pid
+    }
+    return self._GetResultFromJSONRequest(cmd_dict)
+
 
 class PyUITestSuite(pyautolib.PyUITestSuiteBase, unittest.TestSuite):
   """Base TestSuite for PyAuto UI tests."""
 
   def __init__(self, args):
     pyautolib.PyUITestSuiteBase.__init__(self, args)
 
     # Figure out path to chromium binaries
     browser_dir = os.path.normpath(os.path.dirname(pyautolib.__file__))
     logging.debug('Loading pyauto libs from %s', browser_dir)
@@ skipping 289 matching lines @@
     if self._options.verbose:
       verbosity = 2
     result = PyAutoTextTestRuner(verbosity=verbosity).run(pyauto_suite)
     del loaded_tests  # Need to destroy test cases before the suite
     del pyauto_suite
     sys.exit(not result.wasSuccessful())
 
 
 if __name__ == '__main__':
   Main()