Change _ArchiveTestResults to upload to Google Storage

lib/cros_build_lib.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Common python commands used by various build scripts."""
 
 import inspect
 import os
 import subprocess
 import sys
 
 _STDOUT_IS_TTY = hasattr(sys.stdout, 'isatty') and sys.stdout.isatty()
 
 # TODO(sosa):  Move logging to logging module.
 
 def GetCallerName():
   """Returns the name of the calling module with __main__."""
   top_frame = inspect.stack()[-1][0]
   return os.path.basename(top_frame.f_code.co_filename)
 
 
 def RunCommand(cmd, print_cmd=True, error_ok=False, error_message=None,
                exit_code=False, redirect_stdout=False, redirect_stderr=False,
-               cwd=None, input=None, enter_chroot=False):
+               cwd=None, input=None, enter_chroot=False, num_retries=0):
   """Runs a shell command.
 
-  Keyword arguments:
-    cmd - cmd to run.  Should be input to subprocess.POpen.  If a string,
+  Arguments:
+    cmd: cmd to run.  Should be input to subprocess.POpen.  If a string,
       converted to an array using split().
-    print_cmd -- prints the command before running it.
-    error_ok -- does not raise an exception on error.
-    error_message -- prints out this message when an error occurrs.
-    exit_code -- returns the return code of the shell command.
-    redirect_stdout -- returns the stdout.
-    redirect_stderr -- holds stderr output until input is communicated.
-    cwd -- the working directory to run this cmd.
-    input -- input to pipe into this command through stdin.
-    enter_chroot -- this command should be run from within the chroot.  If set,
+    print_cmd: prints the command before running it.
+    error_ok: does not raise an exception on error.
+    error_message: prints out this message when an error occurrs.
+    exit_code: returns the return code of the shell command.
+    redirect_stdout: returns the stdout.
+    redirect_stderr: holds stderr output until input is communicated.
+    cwd: the working directory to run this cmd.
+    input: input to pipe into this command through stdin.
+    enter_chroot: this command should be run from within the chroot.  If set,
       cwd must point to the scripts directory.
+    num_retries: the number of retries to perform before dying
+
+  Returns:
+    If exit_code is True, returns the return code of the shell command.
+    Else returns the output of the shell command.
+
   Raises:
     Exception:  Raises generic exception on error with optional error_message.
   """
   # Set default for variables.
   stdout = None
   stderr = None
   stdin = None
   output = ''
 
   # Modify defaults based on parameters.
   if redirect_stdout:  stdout = subprocess.PIPE
   if redirect_stderr:  stderr = subprocess.PIPE
   if input:  stdin = subprocess.PIPE
   if enter_chroot:  cmd = ['./enter_chroot.sh', '--'] + cmd
 
   # Print out the command before running.
   if print_cmd:
     Info('PROGRAM(%s) -> RunCommand: %r in dir %s' %
          (GetCallerName(), cmd, cwd))
 
-  try:
-    proc = subprocess.Popen(cmd, cwd=cwd, stdin=stdin,
-                            stdout=stdout, stderr=stderr)
-    (output, error) = proc.communicate(input)
-    if exit_code:
-      return proc.returncode
+  for retry_count in range(num_retries + 1):
+    try:
+      proc = subprocess.Popen(cmd, cwd=cwd, stdin=stdin,
+                              stdout=stdout, stderr=stderr)
+      (output, error) = proc.communicate(input)
+      if exit_code and retry_count == num_retries:
+        return proc.returncode
 
-    if not error_ok and proc.returncode:
-      raise Exception('Command "%r" failed.\n' % (cmd) +
-                      (error_message or error or output or ''))
-  except Exception, e:
-    if not error_ok:
-      raise
-    else:
-      Warning(str(e))
+      if proc.returncode == 0:
+        break
+      else:

[scottz-goog, 2010/11/12 23:37:13]

No need for the else here. 

[thieule, 2010/11/13 00:21:32]

Done.

+        raise Exception('Command "%r" failed.\n' % (cmd) +
+                        (error_message or error or output or ''))
+    except Exception, e:

[scottz-goog, 2010/11/12 23:37:13]

Ugg do we really not raise a RunCommand Exception? My heart tells me this should
be fixed but I realize it has been this way for ever :( 

[thieule, 2010/11/13 00:21:32]

Done.

+      if not error_ok and retry_count == num_retries:
+        raise
+      else:
+        Warning(str(e))
+
+    if print_cmd:

[sosa, 2010/11/12 23:33:09]

Little easier to read if this is in the else: of your except clause.

[thieule, 2010/11/13 00:21:32]

Done.

+      Info('PROGRAM(%s) -> RunCommand: retrying %r in dir %s' %
+           (GetCallerName(), cmd, cwd))
 
   return output
 
 
 class Color(object):
   """Conditionally wraps text in ANSI color escape sequences."""
   BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
   BOLD = -1
   COLOR_START = '\033[1;%dm'
   BOLD_START = '\033[1m'
@@ skipping 77 matching lines @@
 
   # Strip the repository root from the path and strip first /.
   relative_path = path_abs_path.replace(root_abs_path, '')[1:]
 
   if relative_path == path_abs_path:
     raise Exception('Error: path is outside your src tree, cannot reinterpret.')
 
   new_path = os.path.join('/home', os.getenv('USER'), 'trunk', relative_path)
   return new_path