Fix adb_logcat_monitor

build/android/buildbot/bb_tests.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 optparse
 import os
@@ skipping 34 matching lines @@
     I_TEST('AndroidWebView',
            'AndroidWebView.apk',
            'org.chromium.android_webview',
            'AndroidWebViewTest',
            'webview:android_webview/test/data/device_files'),
     ])
 
 VALID_TESTS = set(['ui', 'unit', 'webkit', 'webkit_layout'])
 
 
-def RunCmd(command, flunk_on_failure=True):
-  """Run a command relative to the chrome source root."""
-
+def SpawnCmd(command):
+  """Spawn a process without waiting for termination."""
   # Add adb binary to path. In the future, might use build_internal copy.
   env = dict(os.environ)
   env['PATH'] = os.pathsep.join([
       env['PATH'], os.path.join(constants.ANDROID_SDK_ROOT, 'platform-tools')])
+  print '>', ' '.join(map(pipes.quote, command))
+  sys.stdout.flush()
+  if TESTING:
+    class MockPopen(object):
+      @staticmethod
+      def wait():
+        return 0
+    return MockPopen()
 
-  command_str = ' '.join(map(pipes.quote, command))
-  print '>', command_str
-  if not TESTING:
-    code = subprocess.Popen(command, cwd=CHROME_SRC, env=env).wait()
-  else:
-    code = 0
-  print '<', command_str
+  return subprocess.Popen(command, cwd=CHROME_SRC, env=env)
+
+def RunCmd(command, flunk_on_failure=True):
+  """Run a command relative to the chrome source root."""
+  code = SpawnCmd(command).wait()
+  print '<', ' '.join(map(pipes.quote, command))
   if code != 0:
     print 'ERROR: non-zero status %d from %s' % (code, command)
     if flunk_on_failure:
       buildbot_report.PrintError()
     else:
       buildbot_report.PrintWarning()
   return code
 
 
 def RunTestSuites(options, suite):
@@ skipping 79 matching lines @@
 
   if not options.test_filter:
     return
 
   # Device check and alert emails
   RunCmd(['build/android/device_status_check.py'], flunk_on_failure=False)
 
   # Spawn logcat monitor
   logcat_dir = os.path.join(CHROME_SRC, 'out/logcat')
   shutil.rmtree(logcat_dir, ignore_errors=True)
-  if not TESTING:
-    subprocess.Popen(
-        ['build/android/adb_logcat_monitor.py', logcat_dir], cwd=CHROME_SRC)
+  SpawnCmd(['build/android/adb_logcat_monitor.py', logcat_dir])
 
   if 'unit' in options.test_filter:
     RunTestSuites(options, None)
   if 'ui' in options.test_filter:
     for test in INSTRUMENTATION_TESTS.itervalues():
       RunInstrumentationSuite(options, test)
   if 'webkit' in options.test_filter:
     RunTestSuites(options, 'webkit_unit_tests')
     RunTestSuites(options, 'TestWebKitAPI')
     RunWebkitLint(options.target)
@@ skipping 53 matching lines @@
   if unknown_tests:
     return ParserError('Unknown tests %s' % list(unknown_tests))
 
   setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
 
   MainTestWrapper(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))