Bug 1160351 - Bustage fix for 57c6c589cfa1 on a CLOSED TREE
authorGeoff Brown <gbrown@mozilla.com>
Mon, 04 May 2015 11:22:56 -0600
changeset 273655 a6b50156107b9c32230c7c214b68e48e92f7958f
parent 273654 680013c9718fd62d17f0c8cbf91417c80ff7a118
child 273656 3188222d068229029a623956ce16b9eb2fac8643
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1160351
milestone40.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1160351 - Bustage fix for 57c6c589cfa1 on a CLOSED TREE
testing/mozbase/mozdevice/mozdevice/devicemanager.py
--- a/testing/mozbase/mozdevice/mozdevice/devicemanager.py
+++ b/testing/mozbase/mozdevice/mozdevice/devicemanager.py
@@ -153,17 +153,17 @@ class DeviceManager(object):
                   filterOutRegexps=[]):
         """
         Returns the contents of the logcat file as a list of
         '\n' terminated strings
         """
         cmdline = ["/system/bin/logcat", "-v", format, "-d"] + filterSpecs
         output = self.shellCheckOutput(cmdline,
                                       root=self._logcatNeedsRoot)
-        lines = output.replace('\r\n', '\n').splitlines(keepends=True)
+        lines = output.replace('\r\n', '\n').splitlines(True)
 
         for regex in filterOutRegexps:
             lines = [line for line in lines if not re.search(regex, line)]
 
         return lines
 
     def saveScreenshot(self, filename):
         """