Commit caf1e695 authored by Matthew Cary's avatar Matthew Cary Committed by Commit Bot

webkit_layout_test: Correctly deal with unicode on stacks

webkit_layout_tests will fail if there is a non-ascii character in the stack
dump. This CL encodes the stack dump to avoid that. Very probably there is some
other problem that is causing the stack to contain non-ascii characters, but at
this point we can't even tell what's the problem due to the crash (see the bug
for details).

Bug: 880246
Change-Id: I34c5582cc2d4bd98fb17053336e9084624df52a5
Reviewed-on: https://chromium-review.googlesource.com/1204015Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Matthew Cary <mattcary@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589464}
parent 2b543cfd
...@@ -793,7 +793,7 @@ class ChromiumAndroidDriver(driver.Driver): ...@@ -793,7 +793,7 @@ class ChromiumAndroidDriver(driver.Driver):
stderr += '********* [%s] breakpad minidump %s:\n%s' % ( stderr += '********* [%s] breakpad minidump %s:\n%s' % (
self._port.host.filesystem.basename(crash), self._port.host.filesystem.basename(crash),
self._device.serial, self._device.serial,
stack) stack.encode('ascii', 'replace'))
return super(ChromiumAndroidDriver, self)._get_crash_log( return super(ChromiumAndroidDriver, self)._get_crash_log(
stdout, stderr, newer_than) stdout, stderr, newer_than)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment