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

scripts/slave/runtest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """A tool to run a chrome test executable, used by the buildbot slaves.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 67 matching lines @@
       (sandbox_stat.st_uid == 0)):
     return True
   return False
 
 
 def get_temp_count():
   """Returns the number of files and directories inside the temporary dir."""
   return len(os.listdir(tempfile.gettempdir()))
 
 
+def _DoDBusWorkaround():

[ghost stip (do not use), 2013/10/25 18:41:27]

can we just call this LaunchDBus()?

[Ken Russell (switch to Gerrit), 2013/10/25 19:07:12]

Sure, done.

+  """Works around a bug in GLib where it performs operations which

[ghost stip (do not use), 2013/10/25 18:41:27]

"""Launches DBus to work around bug in GLib.

Rest of desc.
"""

[Ken Russell (switch to Gerrit), 2013/10/25 19:07:12]

Done.

+  aren't async-signal-safe (in particular, memory allocations) between
+  fork and exec when it spawns subprocesses. This causes threads
+  inside Chrome's browser and utility processes to get stuck, and this
+  harness to hang waiting for those processes, which will never
+  terminate. This doesn't happen on users' machines, because they have
+  an active desktop session and the DBUS_SESSION_BUS_ADDRESS
+  environment variable set, but it does happen on the bots. See Issue
+  309093 for more details."""
+  import platform
+  import subprocess
+  if (platform.uname()[0].lower() == 'linux' and

[ghost stip (do not use), 2013/10/25 18:41:27]

another option is to only call this in main_linux, which is how xvfb is done. I
think the approach here makes more sense.

[Ken Russell (switch to Gerrit), 2013/10/25 19:07:12]

I like having this here because it should be done as early as possible and makes
the control flow easier to read.

+      'DBUS_SESSION_BUS_ADDRESS' not in os.environ):
+    try:
+      dbus_output = subprocess.check_output(['dbus-launch']).split('\n')

[ghost stip (do not use), 2013/10/25 18:41:27]

put a message here: 'DBUS_SESSION_BUS_ADDRESS not found, starting dbus-launch'

[ghost stip (do not use), 2013/10/25 18:41:27]

I'm assuming dbus-launch daemonizes here, otherwise it will cause the build to
hang at the end. is there an option to dbus-launch to ensure it's daemonized?

[Ken Russell (switch to Gerrit), 2013/10/25 19:07:12]

dbus-launch is synchronous. It runs and exits without starting sub-processes as
far as we have seen (we're already running this workaround for a subset of the
tests on the GPU bots).

[Ken Russell (switch to Gerrit), 2013/10/25 19:07:12]

Done.

+      for line in dbus_output:
+        m = re.match(r"([^=]+)\=(.+)", line)
+        if m:
+          os.environ[m.group(1)] = m.group(2)

[ghost stip (do not use), 2013/10/25 18:41:27]

output to stdout 'setting %s to %s' % (m.group(1), m.group(2))

[Ken Russell (switch to Gerrit), 2013/10/25 19:07:12]

Thanks, I had this before but took it out. Done.

+    except:  # pylint: disable=W0702
+      pass

[ghost stip (do not use), 2013/10/25 18:41:27]

what exception are you expecting here? if it's that dbus-launch isn't found, I
feel like we should print an info message.

[Ken Russell (switch to Gerrit), 2013/10/25 19:07:12]

subprocess.check_output raises CalledProcessError but I wanted to be
conservative in the exceptions caught. Changed to catch everything and print out
any exception that occurs.

[Ken Russell (switch to Gerrit), 2013/10/25 19:12:16]

Sorry, I lied, and made this catch subprocess.CalledProcessError explicitly.

+
 def _RunGTestCommand(command, results_tracker=None, pipes=None,
                      extra_env=None):
 
   env = os.environ.copy()
   env.update(extra_env or {})
 
   if results_tracker:
     return chromium_utils.RunCommand(
         command, pipes=pipes, parser_func=results_tracker.ProcessLine, env=env)
   else:
@@ skipping 1112 matching lines @@
                            default='supplemental_columns',
                            help='A file containing a JSON blob with a dict '
                                 'that will be uploaded to the results '
                                 'dashboard as supplemental columns.')
   option_parser.add_option('', '--enable-lsan', default=False,
                            help='Enable memory leak detection (LeakSanitizer). '
                                 'Also can be enabled with the factory '
                                 'properties "lsan" and "lsan_run_all_tests".')
   option_parser.add_option('', '--extra-sharding-args', default='',
                            help='Extra options for run_test_cases.py.')
+  option_parser.add_option('--do-dbus-workaround', action='store_true',

[ghost stip (do not use), 2013/10/25 18:41:27]

--spawn-dbus

+                           default=False,
+                           help='Work around GLib DBus bug by '
+                                'manually spawning dbus-launch')
 
   chromium_utils.AddPropertiesOptions(option_parser)
   options, args = option_parser.parse_args()
   if not options.perf_dashboard_id:
     options.perf_dashboard_id = options.factory_properties.get('test_name')
 
   options.test_type = options.test_type or options.factory_properties.get(
       'step_name', '')
 
   if options.run_shell_script and options.run_python_script:
     sys.stderr.write('Use either --run-shell-script OR --run-python-script, '
                      'not both.')
     return 1
 
   # Print out builder name for log_parser
   print '[Running on builder: "%s"]' % options.builder_name
 
+  if options.do_dbus_workaround:
+    _DoDBusWorkaround()
+
   # TODO(thakis): Simplify this once ConvertBuildDirToLegacy() ignores its
   # arguments.
   use_out = False
   if sys.platform == 'darwin':
     use_out = (options.factory_properties.get('gclient_env', {})
                         .get('GYP_GENERATORS', '') in ('ninja', 'make'))
   elif sys.platform != 'win32':
     use_out = os.path.exists(
         os.path.join(os.path.dirname(options.build_dir), 'out'))
   options.build_dir, _ = build_directory.ConvertBuildDirToLegacy(
@@ skipping 139 matching lines @@
         '%d new files were left in %s: Fix the tests to clean up themselves.'
         ) % ((new_temp_files - temp_files), tempfile.gettempdir())
     # TODO(maruel): Make it an error soon. Not yet since I want to iron out all
     # the remaining cases before.
     #result = 1
   return result
 
 
 if '__main__' == __name__:
   sys.exit(main())