Add a new script bb_host_steps.py which handles all host side steps.

build/android/buildbot/bb_device_steps.py

 #!/usr/bin/env python
 # Copyright (c) 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 collections
 import glob
-import json
 import multiprocessing
 import optparse
 import os
-import pipes
 import shutil
-import subprocess
 import sys
 

[Isaac (away), 2013/05/29 20:28:07]

change to

import bb_utils

[Siva Chandra, 2013/06/04 00:34:03]

Done.

+from bb_utils import ConvertJson
+from bb_utils import OptParserError
+from bb_utils import RunCmd
+from bb_utils import SpawnCmd
+from bb_utils import TESTING
+
 sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 from pylib import android_commands
 from pylib import buildbot_report
 from pylib import constants
 from pylib.gtest import gtest_config
 
 sys.path.append(os.path.join(
     constants.CHROME_DIR, 'third_party', 'android_testrunner'))
 import errors
 
 
-TESTING = 'BUILDBOT_TESTING' in os.environ
-
 CHROME_SRC = constants.CHROME_DIR
 
 # Describes an instrumation test suite:
 #   test: Name of test we're running.
 #   apk: apk to be installed.
 #   apk_package: package for the apk to be installed.
 #   test_apk: apk to run tests on.
 #   test_data: data folder in format destination:source.
 I_TEST = collections.namedtuple('InstrumentationTest', [
     'name', 'apk', 'apk_package', 'test_apk', 'test_data', 'host_driven_root'])
@@ skipping 15 matching lines @@
            'AndroidWebView.apk',
            'org.chromium.android_webview.shell',
            'AndroidWebViewTest',
            'webview:android_webview/test/data/device_files',
            None),
     ])
 
 VALID_TESTS = set(['chromedriver', 'ui', 'unit', 'webkit', 'webkit_layout'])
 
 
-def SpawnCmd(command):
-  """Spawn a process without waiting for termination."""
-  print '>', ' '.join(map(pipes.quote, command))
-  sys.stdout.flush()
-  if TESTING:
-    class MockPopen(object):
-      @staticmethod
-      def wait():
-        return 0
-    return MockPopen()
-
-  return subprocess.Popen(command, cwd=CHROME_SRC)
-
-def RunCmd(command, flunk_on_failure=True, halt_on_failure=False):
-  """Run a command relative to the chrome source root."""
-  code = SpawnCmd(command).wait()
-  print '<', ' '.join(map(pipes.quote, command))
-  if code != 0:
-    print 'ERROR: process exited with code %d' % code
-    if flunk_on_failure:
-      buildbot_report.PrintError()
-    else:
-      buildbot_report.PrintWarning()
-    # Allow steps to have both halting (i.e. 1) and non-halting exit codes.
-    if code != 0 and code != 88 and halt_on_failure:
-      raise OSError()
-  return code
-
-
 # multiprocessing map_async requires a top-level function for pickle library.
 def RebootDeviceSafe(device):
   """Reboot a device, wait for it to start, and squelch timeout exceptions."""
   try:
     android_commands.AndroidCommands(device).Reboot(True)
   except errors.DeviceUnresponsiveError as e:
     return e
 
 
 def RebootDevices():
@@ skipping 213 matching lines @@
   RunCmd(['build/android/adb_logcat_printer.py', logcat_dir])
 
   buildbot_report.PrintNamedStep('test_report')
   for report in glob.glob(
       os.path.join(CHROME_SRC, 'out', options.target, 'test_logs', '*.log')):
     RunCmd(['cat', report])
     os.remove(report)
 
 
 def main(argv):
+  buildbot_report.PrintNamedStep('Run tests')
   parser = optparse.OptionParser()
 
-  def convert_json(option, _, value, parser):
-    setattr(parser.values, option.dest, json.loads(value))
-
   parser.add_option('--build-properties', action='callback',

[Isaac (away), 2013/05/29 20:28:07]

let's make a function in bb_utils "GetParser()" which adds build-props,
slave_props and factory_props already.

[Siva Chandra, 2013/06/04 00:34:03]

Done.

-                    callback=convert_json, type='string', default={},
+                    callback=ConvertJson, type='string', default={},
                     help='build properties in JSON format')
   parser.add_option('--factory-properties', action='callback',
-                    callback=convert_json, type='string', default={},
+                    callback=ConvertJson, type='string', default={},
                     help='factory properties in JSON format')
   parser.add_option('--slave-properties', action='callback',
-                    callback=convert_json, type='string', default={},
+                    callback=ConvertJson, type='string', default={},
                     help='Properties set by slave script in JSON format')
   parser.add_option('--experimental', action='store_true',
                     help='Run experiemental tests')
   parser.add_option('-f', '--test-filter', metavar='<filter>', default=[],
                     action='append',
                     help=('Run a test suite. Test suites: "%s"' %
                           '", "'.join(VALID_TESTS)))
   parser.add_option('--asan', action='store_true', help='Run tests with asan.')
   parser.add_option('--install', metavar='<apk name>',
                     help='Install an apk by name')
   parser.add_option('--reboot', action='store_true',
                     help='Reboot devices before running tests')
   parser.add_option('--upload-to-flakiness-server', action='store_true',
                     help='Upload the results to the flakiness dashboard.')
   parser.add_option(
       '--auto-reconnect', action='store_true',
       help='Push script to device which restarts adbd on disconnections.')
   options, args = parser.parse_args(argv[1:])
 
-  def ParserError(msg):
-    """We avoid parser.error because it calls sys.exit."""
-    parser.print_help()
-    print >> sys.stderr, '\nERROR:', msg
-    return 1
-
   if args:
-    return ParserError('Unused args %s' % args)
+    return OptParserError(parser, 'Unused args %s' % args)

[Isaac (away), 2013/05/29 20:28:07]

GetParser should be able to return a parser with a custom error function.

[Siva Chandra, 2013/06/04 00:34:03]

Done.

 
   unknown_tests = set(options.test_filter) - VALID_TESTS
   if unknown_tests:
-    return ParserError('Unknown tests %s' % list(unknown_tests))
+    return OptParserError(parser, 'Unknown tests %s' % list(unknown_tests))
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
 
   # Add adb binary and chromium-source platform-tools to tip of PATH variable.
   android_paths = [os.path.join(constants.ANDROID_SDK_ROOT, 'platform-tools')]
 
   # Bots checkout chrome in /b/build/slave/<name>/build/src
   build_internal_android = os.path.abspath(os.path.join(
       CHROME_SRC, '..', '..', '..', '..', '..', 'build_internal', 'scripts',
       'slave', 'android'))
   if os.path.exists(build_internal_android):
     android_paths.insert(0, build_internal_android)
   os.environ['PATH'] = os.pathsep.join(android_paths + [os.environ['PATH']])
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))