telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.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: telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.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

« no previous file with comments | « telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent.py ('k') | telemetry/telemetry/internal/platform/tracing_agent/chrome_tracing_agent_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py

diff --git a/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py b/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py

index 7d5d50f5e7c166427d8119d76cb2c749c3958a58..2e6e9adb78738fbd88851b05b9840bd081f06e73 100644

--- a/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py

+++ b/telemetry/telemetry/internal/platform/tracing_agent/battor_tracing_agent_unittest.py

@@ -11,7 +11,7 @@ from telemetry.internal.platform.tracing_agent import battor_tracing_agent

from telemetry.timeline import trace_data

from telemetry.timeline import tracing_config

-_BATTOR_RETURN = ['fake', 'battor', 'data']

+_BATTOR_RETURN = 'fake\nbattor\ndata'

class FakeBatteryUtils(object):

@@ -170,7 +170,7 @@ class BattOrTracingAgentTest(unittest.TestCase):

builder = builder.AsData()

self.assertTrue(builder.HasTraceFor(trace_data.BATTOR_TRACE_PART))

data_from_builder = builder.GetTraceFor(trace_data.BATTOR_TRACE_PART)

- self.assertEqual('\n'.join(_BATTOR_RETURN), data_from_builder)

+ self.assertEqual(_BATTOR_RETURN, data_from_builder)

def testAndroidCharging(self):

self.assertTrue(self.android_agent._battery.GetCharging())