Bug 1560339 - Extra incoherent logging when running android mochitest r=gbrown a=test-only
authorMarian Raiciof <mraiciof@mozilla.com>
Mon, 22 Jul 2019 14:19:03 +0000
changeset 544707 71fc0f456868dddcee6391a9dc421548ddc69545
parent 544706 82471347dccf306a3450e654f79a85290cb088d5
child 544708 4f7affad853b1bf80ed072649a7b3058c6d064e6
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown, test-only
bugs1560339
milestone69.0
Bug 1560339 - Extra incoherent logging when running android mochitest r=gbrown a=test-only Do not decode data returned by get_file() in adb.py Differential Revision: https://phabricator.services.mozilla.com/D38844
testing/mozbase/mozdevice/mozdevice/adb.py
--- a/testing/mozbase/mozdevice/mozdevice/adb.py
+++ b/testing/mozbase/mozdevice/mozdevice/adb.py
@@ -2284,22 +2284,22 @@ class ADBDevice(ADBCommand):
         """
         with tempfile.NamedTemporaryFile() as tf:
             self.pull(remote, tf.name, timeout=timeout)
             with io.open(tf.name, mode='rb') as tf2:
                 # ADB pull does not support offset and length, but we can
                 # instead read only the requested portion of the local file
                 if offset is not None and length is not None:
                     tf2.seek(offset)
-                    return tf2.read(length).decode("UTF-8", "replace")
+                    return tf2.read(length)
                 elif offset is not None:
                     tf2.seek(offset)
-                    return tf2.read().decode("UTF-8", "replace")
+                    return tf2.read()
                 else:
-                    return tf2.read().decode("UTF-8", "replace")
+                    return tf2.read()
 
     def rm(self, path, recursive=False, force=False, timeout=None, root=False):
         """Delete files or directories on the device.
 
         :param str path: The path of the remote file or directory.
         :param bool recursive: Flag specifying if the command is
             to be applied recursively to the target. Default is False.
         :param bool force: Flag which if True will not raise an