telemetry/telemetry/value/scalar.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/value/scalar.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: telemetry/telemetry/value/scalar.py

diff --git a/telemetry/telemetry/value/scalar.py b/telemetry/telemetry/value/scalar.py

index 8dcd482f7fb0f6ee4758f854c91af4c2c452649c..da8d4afd1d5b7034cab186a8bfef630edc656968 100644

--- a/telemetry/telemetry/value/scalar.py

+++ b/telemetry/telemetry/value/scalar.py

@@ -116,7 +116,10 @@ class ScalarValue(summarizable.SummarizableValue):

none_value_reason = None

if None in merged_value:

merged_value = None

- none_value_reason = none_values.MERGE_FAILURE_REASON

+ merged_none_values = [v for v in values if v.value is None]

+ none_value_reason = (

+ none_values.MERGE_FAILURE_REASON +

+ ' None values: %s' % repr(merged_none_values))

return list_of_scalar_values.ListOfScalarValues(

page, name, v0.units, merged_value, important=v0.important,

description=v0.description,

« no previous file with comments | « telemetry/telemetry/value/list_of_scalar_values_unittest.py ('k') | telemetry/telemetry/value/scalar_unittest.py » ('j') | no next file with comments »