Clean up fifo logcat watcher

- fix double newlines in test results
- reduce log spam (bug 151886)
- some pylint cleanup of the two affected files.

R=bulach@chromium.org,skyostil@chromium.org
BUG=151886

Review URL: https://codereview.chromium.org/10973004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158247 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 33 insertions, 33 deletions

diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index fbde91c..bb8eef3 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -201,6 +201,7 @@ class AndroidCommands(object):
     if device:
       self._adb.SetTargetSerial(device)
     self._logcat = None
+    self.logcat_process = None
     self._pushed_files = []
     self._device_utc_offset = self.RunShellCommand('date +%z')[0]
     self._md5sum_path = ''
@@ -559,7 +560,7 @@ class AndroidCommands(object):
       if not os.path.exists(md5sum_path):
         md5sum_path = '%s/out/Release/md5sum_bin' % (CHROME_SRC)
         if not os.path.exists(md5sum_path):
-          print >>sys.stderr, 'Please build md5sum.'
+          print >> sys.stderr, 'Please build md5sum.'
           sys.exit(1)
       command = 'push %s %s' % (md5sum_path, MD5SUM_DEVICE_PATH)
       assert _HasAdbPushSucceeded(self._adb.SendCommand(command))
@@ -689,25 +690,6 @@ class AndroidCommands(object):
       args.append('*:v')
 
     if logfile:
-      class NewLineNormalizer(object):
-        """A file-like object to normalize EOLs to '\n'.
-
-        Pexpect runs adb within a pseudo-tty device (see
-        http://www.noah.org/wiki/pexpect), so any '\n' printed by adb is written
-        as '\r\n' to the logfile. Since adb already uses '\r\n' to terminate
-        lines, the log ends up having '\r\r\n' at the end of each line. This
-        filter replaces the above with a single '\n' in the data stream.
-        """
-        def __init__(self, output):
-          self.output = output
-
-        def write(self, data):
-          data = data.replace('\r\r\n', '\n')
-          self.output.write(data)
-
-        def flush(self):
-          self.output.flush()
-
       logfile = NewLineNormalizer(logfile)
 
     # Spawn logcat and syncronize with it.
@@ -1015,3 +997,23 @@ class AndroidCommands(object):
     status = self._adb.SendShellCommand(
         '\'ls "%s" >/dev/null 2>&1; echo $?\'' % (file_name))
     return int(status) == 0
+
+
+class NewLineNormalizer(object):
+  """A file-like object to normalize EOLs to '\n'.
+
+  Pexpect runs adb within a pseudo-tty device (see
+  http://www.noah.org/wiki/pexpect), so any '\n' printed by adb is written
+  as '\r\n' to the logfile. Since adb already uses '\r\n' to terminate
+  lines, the log ends up having '\r\r\n' at the end of each line. This
+  filter replaces the above with a single '\n' in the data stream.
+  """
+  def __init__(self, output):
+    self._output = output
+
+  def write(self, data):
+    data = data.replace('\r\r\n', '\n')
+    self._output.write(data)
+
+  def flush(self):
+    self._output.flush()
diff --git a/build/android/pylib/test_package_apk.py b/build/android/pylib/test_package_apk.py
index 5c633cc..7d2a3a8 100644
--- a/build/android/pylib/test_package_apk.py
+++ b/build/android/pylib/test_package_apk.py
@@ -4,19 +4,16 @@
 
 
 import os
-import re
-import sys
-
-import cmd_helper
-import constants
-import logging
 import pexpect
 import shlex
-import shutil
+import sys
 import tempfile
-from test_package import TestPackage
 import time
 
+import android_commands
+import constants
+from test_package import TestPackage
+
 
 class TestPackageApk(TestPackage):
   """A helper class for running APK-based native tests.
@@ -62,7 +59,7 @@ class TestPackageApk(TestPackage):
   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...'
@@ -72,7 +69,7 @@ class TestPackageApk(TestPackage):
       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."""
@@ -97,8 +94,8 @@ class TestPackageApk(TestPackage):
     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:
@@ -110,7 +107,8 @@ class TestPackageApk(TestPackage):
         '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