Updates the test runner script exit codes

build/android/buildbot/bb_utils.py

 # Copyright 2013 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 json
 import optparse
 import os
 import pipes
 import subprocess
 import sys
 
+import buildbot_report

[frankf, 2013/07/09 00:37:56]

I think the convention is bb_*. It might makes sense to have this in bb_utils. I
defer to ilevy.

+
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
-from pylib import buildbot_report
+from pylib import constants
 
 
 TESTING = 'BUILDBOT_TESTING' in os.environ
 
 BB_BUILD_DIR = os.path.abspath(
     os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir,
     os.pardir, os.pardir, os.pardir, os.pardir))
 
 CHROME_SRC = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..', '..'))
@@ skipping 11 matching lines @@
   sys.stdout.flush()
   if TESTING:
     class MockPopen(object):
       @staticmethod
       def wait():
         return 0
     return MockPopen()
   return subprocess.Popen(command, cwd=CHROME_SRC, stdout=stdout)
 
 
-def RunCmd(command, flunk_on_failure=True, halt_on_failure=False,
-           warning_code=88, stdout=None):
+def RunCmd(command, flunk_on_failure=True, halt_on_failure=False, stdout=None):
   """Run a command relative to the chrome source root."""
   code = SpawnCmd(command, stdout).wait()
   print '<', CommandToString(command)
   if code != 0:
     print 'ERROR: process exited with code %d' % code
-    if code != warning_code and flunk_on_failure:
+    if code != constants.WARNING_EXIT_CODE and flunk_on_failure:

[frankf, 2013/07/09 00:37:56]

You're assuming every arbitrary command uses our warning convention. Rather, you
should have constants.WARNING_EXIT_CODE as default parameter like before.

[gkanwar, 2013/07/09 00:47:42]

Ah my mistake. Switched back to a default parameter.

       buildbot_report.PrintError()
     else:
       buildbot_report.PrintWarning()
     # Allow steps to have both halting (i.e. 1) and non-halting exit codes.
-    if code != warning_code and halt_on_failure:
-      print 'FATAL %d != %d' % (code, warning_code)
+    if code != constants.WARNING_EXIT_CODE and halt_on_failure:
+      print 'FATAL %d != %d' % (code, constants.WARNING_EXIT_CODE)
       sys.exit(1)
   return code
 
 
 def GetParser():
   def ConvertJson(option, _, value, parser):
     setattr(parser.values, option.dest, json.loads(value))
   parser = optparse.OptionParser()
   parser.add_option('--build-properties', action='callback',
                     callback=ConvertJson, type='string', default={},
@@ skipping 11 matching lines @@
 
 def RunSteps(steps, step_cmds, options):
   unknown_steps = set(steps) - set(step for step, _ in step_cmds)
   if unknown_steps:
     print >> sys.stderr, 'FATAL: Unknown steps %s' % list(unknown_steps)
     sys.exit(1)
 
   for step, cmd in step_cmds:
     if step in steps:
       cmd(options)