Strip out \r characters from pexpect's log capture before adding the results.

Strip out \r characters from pexpect's log capture before adding the results.

BUG=250002
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=206960

[scherkus (not reviewing), 2013-06-17 23:47:36]

frankf: what do you think?

I don't know much about this code ... but this seems to do the trick.

If you have something better in the works I'm happy to close this CL.

[frankf, 2013-06-18 00:04:58]

Thanks for fixing this. Make sure to run all android try bots and verify the
output.

https://codereview.chromium.org/16854020/diff/1/build/android/pylib/gtest/tes...
File build/android/pylib/gtest/test_package.py (right):

https://codereview.chromium.org/16854020/diff/1/build/android/pylib/gtest/tes...
build/android/pylib/gtest/test_package.py:160: log = p.before.replace('\r', '')
Move this to line 158

https://codereview.chromium.org/16854020/diff/1/build/android/pylib/gtest/tes...
build/android/pylib/gtest/test_package.py:183: full_test_name,
base_test_result.ResultType.CRASH, log=p.before))
log=log

https://codereview.chromium.org/16854020/diff/1/build/android/pylib/gtest/tes...
build/android/pylib/gtest/test_package.py:189: full_test_name,
base_test_result.ResultType.TIMEOUT, log=p.before))
Same here.

[scherkus (not reviewing), 2013-06-18 00:41:19]

PTAL -- running trybots now

https://codereview.chromium.org/16854020/diff/1/build/android/pylib/gtest/tes...
File build/android/pylib/gtest/test_package.py (right):

https://codereview.chromium.org/16854020/diff/1/build/android/pylib/gtest/tes...
build/android/pylib/gtest/test_package.py:160: log = p.before.replace('\r', '')
On 2013/06/18 00:04:59, frankf wrote:
> Move this to line 158

Done.

https://codereview.chromium.org/16854020/diff/1/build/android/pylib/gtest/tes...
build/android/pylib/gtest/test_package.py:183: full_test_name,
base_test_result.ResultType.CRASH, log=p.before))
On 2013/06/18 00:04:59, frankf wrote:
> log=log

Done.

https://codereview.chromium.org/16854020/diff/1/build/android/pylib/gtest/tes...
build/android/pylib/gtest/test_package.py:189: full_test_name,
base_test_result.ResultType.TIMEOUT, log=p.before))
On 2013/06/18 00:04:59, frankf wrote:
> Same here.

Done.

[scherkus (not reviewing), 2013-06-18 01:28:56]

frankf: is there a trybot that runs the tests? there only seems to be compile
bots

in any case, I'm happy watching the bots after this change lands

[frankf, 2013-06-18 01:37:13]

lgtm

Yes, there are test bots that get automatically trigerred by builders, please
wait for those.

[scherkus (not reviewing), 2013-06-18 05:17:52]

test bot output looks good -- clicking commit

thanks for the review!

[commit-bot: I haz the power, 2013-06-18 05:18:20]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/scherkus@chromium.org/16854020/19001

[commit-bot: I haz the power, 2013-06-18 12:49:53]

Change committed as 206960