Bug 1160351 - Improve newline handling in getLogcat; r=bc

dothq · May 4, 2015 · 8f916d8 · 8f916d8
1 parent 47e7595
commit 8f916d8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/testing/mozbase/mozcrash/mozcrash/mozcrash.py b/testing/mozbase/mozcrash/mozcrash/mozcrash.py
@@ -335,7 +335,7 @@ def check_for_java_exception(logcat, quiet=False):
                 if not quiet:
                     print "PROCESS-CRASH | java-exception | %s %s" % (exception_type, exception_location)
             else:
-                print "Automation Error: Logcat is truncated!"
+                print "Automation Error: java exception in logcat at line %d of %d: %s" % (i, len(logcat), line)
             break
 
     return found_exception
diff --git a/testing/mozbase/mozdevice/mozdevice/devicemanager.py b/testing/mozbase/mozdevice/mozdevice/devicemanager.py
@@ -152,11 +152,13 @@ def getLogcat(self, filterSpecs=["dalvikvm:I", "ConnectivityService:S",
                   format="time",
                   filterOutRegexps=[]):
         """
-        Returns the contents of the logcat file as a list of strings
+        Returns the contents of the logcat file as a list of
+        '\n' terminated strings
         """
         cmdline = ["/system/bin/logcat", "-v", format, "-d"] + filterSpecs
-        lines = self.shellCheckOutput(cmdline,
-                                      root=self._logcatNeedsRoot).split('\r')
+        output = self.shellCheckOutput(cmdline,
+                                      root=self._logcatNeedsRoot)
+        lines = output.replace('\r\n', '\n').splitlines(keepends=True)
 
         for regex in filterOutRegexps:
             lines = [line for line in lines if not re.search(regex, line)]