Attempt to deflake content_shell_crash_test on linux

content/shell/tools/breakpad_integration_test.py

 #!/usr/bin/env python
 #
 # Copyright 2014 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.
 
 """Integration test for breakpad in content shell.
 
 This test checks that content shell and breakpad are correctly hooked up, as
 well as that the tools can symbolize a stack trace."""
 
 
 import glob
 import json
 import optparse
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
+import time
 
 
 CONCURRENT_TASKS=4
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('', '--build-dir', default='',
                     help='The build output directory.')
   parser.add_option('', '--binary', default='',
@@ skipping 31 matching lines @@
   try:
     if sys.platform == 'win32':
       print "# Starting crash service."
       crash_service_exe = os.path.join(options.build_dir,
                                        'content_shell_crash_service.exe')
       cmd = [crash_service_exe, '--dumps-dir=%s' % crash_dir]
       if options.verbose:
         print ' '.join(cmd)
       failure = 'Failed to start crash service.'
       crash_service = subprocess.Popen(cmd)
+      # We add a delay here to give the crash service some time to create
+      # the pipe it uses to communicate with the content shell.
+      time.sleep(1)
     else:
       print "# Generate symbols."
       breakpad_tools_dir = os.path.join(
           os.path.dirname(__file__), '..', '..', '..',
           'components', 'crash', 'content', 'tools')
       generate_symbols = os.path.join(
           breakpad_tools_dir, 'generate_breakpad_symbols.py')
       symbols_dir = os.path.join(crash_dir, 'symbols')
       cmd = [generate_symbols,
              '--build-dir=%s' % options.build_dir,
@@ skipping 14 matching lines @@
            '--crash-dumps-dir=%s' % crash_dir]
     if options.verbose:
       print ' '.join(cmd)
     failure = 'Failed to run content_shell.'
     if options.verbose:
       subprocess.check_call(cmd)
     else:
       with open(os.devnull, 'w') as devnull:
         subprocess.check_call(cmd, stdout=devnull, stderr=devnull)
 
-    if sys.platform == 'win32':
-      print "# Stopping crash service"
-      failure = 'Failed to stop crash service.'
-      crash_service.terminate()
-      crash_service = None
-
     print "# Retrieve crash dump."
     dmp_files = glob.glob(os.path.join(crash_dir, '*.dmp'))
     failure = 'Expected 1 crash dump, found %d.' % len(dmp_files)
     if len(dmp_files) != 1:
       raise Exception(failure)
     dmp_file = dmp_files[0]
 
     if sys.platform != 'win32':
       minidump = os.path.join(crash_dir, 'minidump')
       dmp_to_minidump = os.path.join(breakpad_tools_dir, 'dmp2minidump.py')
@@ skipping 51 matching lines @@
   else:
     print "PASS: Breakpad integration test ran successfully."
     if options.json:
       with open(options.json, 'w') as json_file:
         json.dump([], json_file)
     return 0
 
   finally:
     if crash_service:
       crash_service.terminate()
+      crash_service.wait()
     try:
       shutil.rmtree(crash_dir)
     except:
       print 'Failed to delete temp directory "%s".' % crash_dir
 
 
 if '__main__' == __name__:
   sys.exit(main())