Tools/Scripts/webkitpy/layout_tests/port/android.py - Issue 590983002: Revert of Try #3 to fix the android layout tests crash in run-webkit-tests.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Tools/Scripts/webkitpy/layout_tests/port/android.py

Issue 590983002: Revert of Try #3 to fix the android layout tests crash in run-webkit-tests. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: Tools/Scripts/webkitpy/layout_tests/port/android.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/android.py b/Tools/Scripts/webkitpy/layout_tests/port/android.py

index 8e6e71e452d3d46dccaaf96196ffd70a11812495..8a84b112a2b741e82e23e491d621c14682c86a49 100644

--- a/Tools/Scripts/webkitpy/layout_tests/port/android.py

+++ b/Tools/Scripts/webkitpy/layout_tests/port/android.py

@@ -257,7 +257,9 @@

result = self._executive.run_command(self.adb_command() + command, error_handler=error_handler, debug_logging=self._debug_logging)

# We limit the length to avoid outputting too verbose commands, such as "adb logcat".

- self._log_debug('Run adb result: ' + result[:80])

+ # Also make sure that the output is ascii-encoded to avoid confusing other parts of

+ # the system.

+ self._log_debug('Run adb result: ' + result[:80].encode('ascii', errors='replace'))

return result

def get_serial(self):

« no previous file with comments | « no previous file | Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py » ('j') | no next file with comments »