Clean up fifo logcat watcher

build/android/pylib/test_package_apk.py

 # 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.
 
 
 import os
-import re
-import sys
-
-import cmd_helper
-import constants
-import logging
 import pexpect
 import shlex
-import shutil
+import sys
 import tempfile
+import time
+
+import android_commands
+import constants
 from test_package import TestPackage
-import time
 
 
 class TestPackageApk(TestPackage):
   """A helper class for running APK-based native tests.
 
   Args:
     adb: ADB interface the tests are using.
     device: Device to run the tests.
     test_suite: A specific test suite to run, empty to run all.
     timeout: Timeout for each test.
@@ skipping 26 matching lines @@
   def _GetFifo(self):
     # The test.fifo path is determined by:
     # testing/android/java/src/org/chromium/native_test/
     #     ChromeNativeTestActivity.java and
     # testing/android/native_test_launcher.cc
     return '/data/data/org.chromium.native_test/files/test.fifo'
 
   def _ClearFifo(self):
     self.adb.RunShellCommand('rm -f ' + self._GetFifo())
 
-  def _WatchFifo(self, timeout):
+  def _WatchFifo(self, timeout, logfile=None):
     for i in range(5):
       if self.adb.FileExistsOnDevice(self._GetFifo()):
         print 'Fifo created...'
         break
       time.sleep(i)
     else:
       raise Exception('Unable to find fifo on device %s ' % self._GetFifo())
     args = shlex.split(self.adb.Adb()._target_arg)
     args += ['shell', 'cat', self._GetFifo()]
-    return pexpect.spawn('adb', args, timeout=timeout, logfile=sys.stdout)
+    return pexpect.spawn('adb', args, timeout=timeout, logfile=logfile)
 
   def GetAllTests(self):
     """Returns a list of all tests available in the test suite."""
     self._CreateTestRunnerScript('--gtest_list_tests')
     try:
       self.tool.SetupEnvironment()
       # Clear and start monitoring logcat.
       self._ClearFifo()
       self.adb.RunShellCommand(
           'am start -n '
           'org.chromium.native_test/'
           'org.chromium.native_test.ChromeNativeTestActivity')
       # Wait for native test to complete.
       p = self._WatchFifo(timeout=30 * self.tool.GetTimeoutScale())
       p.expect("<<ScopedMainEntryLogger")
       p.close()
     finally:
       self.tool.CleanUpEnvironment()
     # We need to strip the trailing newline.
     content = [line.rstrip() for line in p.before.splitlines()]
     ret = self._ParseGTestListTests(content)
     return ret
 
   def CreateTestRunnerScript(self, gtest_filter, test_arguments):
-     self._CreateTestRunnerScript('--gtest_filter=%s %s' % (gtest_filter,
-                                                            test_arguments))
+    self._CreateTestRunnerScript('--gtest_filter=%s %s' % (gtest_filter,
+                                                           test_arguments))
 
   def RunTestsAndListResults(self):
     try:
       self.tool.SetupEnvironment()
       self._ClearFifo()
       self.adb.RunShellCommand(
        'am start -n '
         'org.chromium.native_test/'
         'org.chromium.native_test.ChromeNativeTestActivity')
     finally:
       self.tool.CleanUpEnvironment()
-    return self._WatchTestOutput(self._WatchFifo(timeout=10))
+    logfile = android_commands.NewLineNormalizer(sys.stdout)
+    return self._WatchTestOutput(self._WatchFifo(timeout=10, logfile=logfile))
 
   def StripAndCopyExecutable(self):
     # Always uninstall the previous one (by activity name); we don't
     # know what was embedded in it.
     self.adb.ManagedInstall(self.test_suite_full, False,
                             package_name='org.chromium.native_test')
 
   def _GetTestSuiteBaseName(self):
     """Returns the  base name of the test suite."""
     # APK test suite names end with '-debug.apk'
     return os.path.basename(self.test_suite).rsplit('-debug', 1)[0]