Added GLib/DBus workaround to runtest.py under --do-dbus-workaround option.

scripts/slave/recipe_modules/chromium/api.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.
 
 from slave import recipe_api
 
 class ChromiumApi(recipe_api.RecipeApi):
   def get_config_defaults(self):
     return {
       'HOST_PLATFORM': self.m.platform.name,
@@ skipping 29 matching lines @@
     args.append('--')
     args.extend(targets)
     return self.m.python(name or 'compile',
                          self.m.path.build('scripts', 'slave', 'compile.py'),
                          args, abort_on_failure=True, **kwargs)
 
   def runtests(self, test, args=None, xvfb=False, name=None, annotate=None,
                results_url=None, perf_dashboard_id=None, test_type=None,
                generate_json_file=False, results_directory=None,
                build_number=None, builder_name=None, python_mode=False,
-               **kwargs):
+               spawn_dbus=False, **kwargs):
     """Return a runtest.py invocation."""
     args = args or []
     assert isinstance(args, list)
 
     t_name, ext = self.m.path.splitext(self.m.path.basename(test))
     if not python_mode and self.m.platform.is_win and ext == '':
       test += '.exe'
 
     full_args = [
       '--target', self.c.build_config_fs,
@@ skipping 15 matching lines @@
     if generate_json_file:
       full_args.append('--generate-json-file')
     if results_directory:
       full_args.append('--results-directory=%s' % results_directory)
     if build_number:
       full_args.append('--build-number=%s' % build_number)
     if builder_name:
       full_args.append('--builder-name=%s' % builder_name)
     if ext == '.py' or python_mode:
       full_args.append('--run-python-script')
+    if spawn_dbus:
+      full_args.append('--spawn-dbus')
     full_args.append(test)
     full_args.extend(args)
 
     # By default, always run the tests.
     kwargs.setdefault('always_run', True)
 
     return self.m.python(
       name or t_name,
       self.m.path.build('scripts', 'slave', 'runtest.py'),
       full_args,
       **kwargs
     )
 
   def run_telemetry_test(self, runner, test, name='', args=None,
-      results_directory=''):
+      results_directory='', spawn_dbus=False):
     # Choose a reasonable default for the location of the sandbox binary
     # on the bots.
     env = {}
     if self.m.platform.is_linux:
       env['CHROME_DEVEL_SANDBOX'] = self.m.path.join(
           '/opt', 'chromium', 'chrome_sandbox')
 
     if not name:
       name = test
 
@@ skipping 17 matching lines @@
         runner,
         test_args,
         annotate='gtest',
         name=name,
         test_type=name,
         generate_json_file=True,
         results_directory=results_directory,
         build_number=self.m.properties['buildnumber'],
         builder_name=self.m.properties['buildername'],
         python_mode=True,
+        spawn_dbus=spawn_dbus,
         env=env)
 
   def runhooks(self, **kwargs):
     """Run the build-configuration hooks for chromium."""
     env = kwargs.get('env', {})
     env.update(self.c.gyp_env.as_jsonish())
     kwargs['env'] = env
     return self.m.gclient.runhooks(**kwargs)