common/battor/battor/battor_wrapper_devicetest.py - Issue 2162963002: [polymer] Merge of master into polymer10-migration

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: common/battor/battor/battor_wrapper_devicetest.py

Issue 2162963002: [polymer] Merge of master into polymer10-migration (Closed) Base URL: git@github.com:catapult-project/catapult.git@polymer10-migration

Patch Set: Merge polymer10-migration int polymer10-merge Created 4 years, 5 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: common/battor/battor/battor_wrapper_devicetest.py

diff --git a/common/battor/battor/battor_wrapper_devicetest.py b/common/battor/battor/battor_wrapper_devicetest.py

index 8ff501eae6f8f811f4f2c86f6e5be01f551b378e..002893f6cd43cd96ca714d302a13a718111a4c28 100644

--- a/common/battor/battor/battor_wrapper_devicetest.py

+++ b/common/battor/battor/battor_wrapper_devicetest.py

@@ -68,7 +68,7 @@ class BattorWrapperDeviceTest(unittest.TestCase):

if self._platform == 'win':

time.sleep(5)

battor._battor_shell.kill()

- results = battor.CollectTraceData()

+ results = battor.CollectTraceData().splitlines()

except:

if battor._battor_shell is not None:

battor._battor_shell.kill()

« no previous file with comments | « common/battor/battor/battor_wrapper.py ('k') | dashboard/app.yaml » ('j') | no next file with comments »