Pulling back revision 6635 and 6634 due to broken builds.

tools/browser_tester/browsertester/browserlauncher.py

 #!/usr/bin/python
 # Copyright (c) 2011 The Native Client 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 os.path
 import re
 import shutil
+import subprocess
 import sys
 import tempfile
 import time
 
-import browserprocess
-
-class LaunchFailure(Exception):
-  pass
-
-
-def GetPlatform():
-  if sys.platform == 'darwin':
-    platform = 'mac'
-  elif sys.platform.startswith('linux'):
-    platform = 'linux'
-  elif sys.platform in ('cygwin', 'win32'):
-    platform = 'windows'
-  else:
-    raise LaunchFailure('Unknown platform: %s' % sys.platform)
-  return platform
-
-
-PLATFORM = GetPlatform()
+# mozrunner is needed as long as we are supporting versions of Python
+# before 2.6.
+import mozrunner
 
 
 def SelectRunCommand():
   # The subprocess module added support for .kill in Python 2.6
   if sys.version_info[0] < 2 or (sys.version_info[0] == 2 and
                                  sys.version_info[1] < 6):
-    return browserprocess.RunCommandWithMozrunner
-  elif PLATFORM == 'linux':
-    return browserprocess.RunCommandInProcessGroup
+    return mozrunner.run_command
   else:
-    return browserprocess.RunCommandWithSubprocess
+    return subprocess.Popen
 
 
 RunCommand = SelectRunCommand()
 
 def RemoveDirectory(path):
   retry = 5
   sleep_time = 0.25
   while True:
     try:
       shutil.rmtree(path)
     except Exception:
       # Windows processes sometime hang onto files too long
       if retry > 0:
         retry -= 1
         time.sleep(sleep_time)
         sleep_time *= 2
       else:
         # No luck - don't mask the error
         raise
     else:
       # succeeded
       break
 
 
+class LaunchFailure(Exception):
+  pass
+
+
+def GetPlatform():
+  if sys.platform == 'darwin':
+    platform = 'mac'
+  elif sys.platform.startswith('linux'):
+    platform = 'linux'
+  elif sys.platform in ('cygwin', 'win32'):
+    platform = 'windows'
+  else:
+    raise LaunchFailure('Unknown platform: %s' % sys.platform)
+  return platform
+
+
+PLATFORM = GetPlatform()
+
 
 # In Windows, subprocess seems to have an issue with file names that
 # contain spaces.
 def EscapeSpaces(path):
   if PLATFORM == 'windows' and ' ' in path:
     return '"%s"' % path
   return path
 
 
 def MakeEnv(options):
@@ skipping 41 matching lines @@
       return self.options.browser_path
     else:
       path = self.KnownPath()
       if path is None or not os.path.exists(path):
         raise LaunchFailure('Cannot find the browser directory')
       binary = os.path.join(path, self.BinaryName())
       if not os.path.exists(binary):
         raise LaunchFailure('Cannot find the browser binary')
       return binary
 
+  # subprocess.wait() doesn't have a timeout, unfortunately.
   def WaitForProcessDeath(self):
-    self.browser_process.Wait(self.WAIT_STEPS, self.SLEEP_TIME)
+    i = 0
+    while self.handle.poll() is None and i < self.WAIT_STEPS:
+      time.sleep(self.SLEEP_TIME)
+      i += 1
 
   def Cleanup(self):
-    self.browser_process.Kill()
+    if self.handle.poll() is None:
+      print 'KILLING the browser'
+      try:
+        self.handle.kill()
+        # If it doesn't die, we hang.  Oh well.
+        self.handle.wait()
+      except Exception:
+        # If it is already dead, then it's ok.
+        # This may happen if the browser dies after the first poll, but before
+        # the kill.
+        if self.handle.poll() is None:
+          raise
 
     RemoveDirectory(self.profile)
     if self.tool_log_dir is not None:
       RemoveDirectory(self.tool_log_dir)
 
   def MakeProfileDirectory(self):
     self.profile = tempfile.mkdtemp(prefix='browserprofile_')
     return self.profile
 
   def Launch(self, cmd, env):
     browser_path = cmd[0]
     if not os.path.exists(browser_path):
       raise LaunchFailure('Browser does not exist %r'% browser_path)
     if not os.access(browser_path, os.X_OK):
       raise LaunchFailure('Browser cannot be executed %r (Is this binary on an '
                           'NFS volume?)' % browser_path)
     if self.options.sel_ldr:
       env['NACL_SEL_LDR'] = self.options.sel_ldr
     if self.options.irt_library:
       env['NACL_IRT_LIBRARY'] = self.options.irt_library
     if self.options.enable_experimental_js:
       env['NACL_ENABLE_EXPERIMENTAL_JAVASCRIPT_APIS'] = '1'
     if self.options.prefer_portable_in_manifest:
       env['NACL_PREFER_PORTABLE_IN_MANIFEST'] = '1'
     print 'ENV:', ' '.join(['='.join(pair) for pair in env.iteritems()])
     print 'LAUNCHING: %s' % ' '.join(cmd)
     sys.stdout.flush()
-    self.browser_process = RunCommand(cmd, env=env)
+    self.handle = RunCommand(cmd, env=env)
+    print 'PID', self.handle.pid
 
   def IsRunning(self):
-    return self.browser_process.IsRunning()
+    return self.handle.poll() is None
 
   def GetReturnCode(self):
-    return self.browser_process.GetReturnCode()
+    return self.handle.returncode
 
   def Run(self, url, port):
     self.binary = EscapeSpaces(self.FindBinary())
     self.profile = self.CreateProfile()
     if self.options.tool is not None:
       self.tool_log_dir = self.CreateToolLogDir()
     cmd = self.MakeCmd(url, port)
     self.Launch(cmd, MakeEnv(self.options))
 
 
@@ skipping 95 matching lines @@
              '--trace-children=yes',
              '--nacl-file=%s' % (self.options.files[0],),
              '--ignore=../tools/valgrind/tsan/ignores.txt',
              '--suppressions=../tools/valgrind/tsan/suppressions.txt',
              '--log-file=%s/log.%%p' % (self.tool_log_dir,)] + cmd
     elif self.options.tool != None:
       raise LaunchFailure('Invalid tool name "%s"' % (self.options.tool,))
     cmd.extend(self.options.browser_flags)
     cmd.append(url)
     return cmd