Index: dashboard/dashboard/add_histograms_test.py |
diff --git a/dashboard/dashboard/add_histograms_test.py b/dashboard/dashboard/add_histograms_test.py |
index 3835ba6592743634a14e4677a28ec8ed5fd52cef..b0e6464628060e35ddc41dff8c7f73003cbad734 100644 |
--- a/dashboard/dashboard/add_histograms_test.py |
+++ b/dashboard/dashboard/add_histograms_test.py |
@@ -52,33 +52,32 @@ class AddHistogramsEndToEndTest(testing_common.TestCase): |
def testPostHistogramEndToEnd(self): |
data = json.dumps([ |
{ |
- 'benchmarkName': 'benchmark', |
- 'canonicalUrl': '', |
+ 'values': ['benchmark'], |
'guid': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- 'label': '', |
- 'legacyTIRLabel': '', |
- 'storyDisplayName': 'story', |
- 'type': 'TelemetryInfo' |
+ 'type': 'GenericSet', |
}, { |
'values': [424242], |
'guid': '25f0a111-9bb4-4cea-b0c1-af2609623160', |
'type': 'GenericSet', |
}, { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': '', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['bot'], |
+ 'guid': '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ 'type': 'GenericSet' |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae' |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
}, |
'guid': '2a714c36-f4ef-488d-8bee-93c7e3149388', |
'name': 'foo2', |
@@ -89,7 +88,7 @@ class AddHistogramsEndToEndTest(testing_common.TestCase): |
self.ExecuteTaskQueueTasks('/add_histograms_queue', |
add_histograms.TASK_QUEUE_NAME) |
diagnostics = histogram.SparseDiagnostic.query().fetch() |
- self.assertEqual(2, len(diagnostics)) |
+ self.assertEqual(3, len(diagnostics)) |
histograms = histogram.Histogram.query().fetch() |
self.assertEqual(1, len(histograms)) |
@@ -119,33 +118,38 @@ class AddHistogramsTest(testing_common.TestCase): |
def testPostHistogramSetsTestPathAndRevision(self): |
data = json.dumps([ |
{ |
- 'benchmarkName': 'benchmark', |
- 'canonicalUrl': '', |
+ 'values': ['benchmark'], |
'guid': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- 'label': '', |
- 'legacyTIRLabel': '', |
- 'storyDisplayName': 'story', |
- 'type': 'TelemetryInfo' |
+ 'type': 'GenericSet', |
}, { |
'values': [424242], |
'guid': '25f0a111-9bb4-4cea-b0c1-af2609623160', |
'type': 'GenericSet', |
}, { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': '', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['bot'], |
+ 'guid': '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['story'], |
+ 'guid': 'dc894bd9-0b73-4400-9d95-b21ee371031d', |
+ 'type': 'GenericSet', |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.STORIES.name: |
+ 'dc894bd9-0b73-4400-9d95-b21ee371031d', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae' |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
}, |
'guid': '4989617a-14d6-4f80-8f75-dafda2ff13b0', |
'name': 'foo', |
@@ -153,10 +157,16 @@ class AddHistogramsTest(testing_common.TestCase): |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae' |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
+ reserved_infos.STORIES.name: |
+ 'dc894bd9-0b73-4400-9d95-b21ee371031d', |
}, |
'guid': '2a714c36-f4ef-488d-8bee-93c7e3149388', |
'name': 'foo2', |
@@ -183,33 +193,36 @@ class AddHistogramsTest(testing_common.TestCase): |
def testPostHistogramPassesHistogramLevelSparseDiagnostics(self): |
data = json.dumps([ |
{ |
- 'benchmarkName': 'benchmark', |
- 'canonicalUrl': '', |
+ 'values': ['benchmark'], |
+ 'guid': '876d0fba-1d12-4c00-a7e9-5fed467e19e3', |
+ 'type': 'GenericSet', |
+ }, { |
+ 'values': [], |
'guid': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- 'label': '', |
- 'legacyTIRLabel': '', |
- 'storyDisplayName': 'story', |
- 'type': 'TelemetryInfo' |
+ 'type': 'GenericSet', |
}, { |
'values': [424242], |
'guid': '25f0a111-9bb4-4cea-b0c1-af2609623160', |
'type': 'GenericSet', |
}, { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': '', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['bot'], |
+ 'guid': '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ 'type': 'GenericSet' |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae' |
+ reserved_infos.BENCHMARKS.name: |
+ '876d0fba-1d12-4c00-a7e9-5fed467e19e3', |
}, |
'guid': '4989617a-14d6-4f80-8f75-dafda2ff13b0', |
'name': 'foo', |
@@ -217,10 +230,16 @@ class AddHistogramsTest(testing_common.TestCase): |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ reserved_infos.GPUS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae' |
+ reserved_infos.BENCHMARKS.name: |
+ '876d0fba-1d12-4c00-a7e9-5fed467e19e3', |
}, |
'guid': '2a714c36-f4ef-488d-8bee-93c7e3149388', |
'name': 'foo2', |
@@ -239,14 +258,9 @@ class AddHistogramsTest(testing_common.TestCase): |
def testPostHistogram_AddsNewSparseDiagnostic(self): |
diag_dict = { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': 'buildbotmaster0', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
- 'guid': '6ce177ab-3fdb-44cb-aa8d-9ed49765d810', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'values': ['master'], |
+ 'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ 'type': 'GenericSet' |
} |
diag = histogram.SparseDiagnostic( |
data=diag_dict, start_revision=1, end_revision=sys.maxint, |
@@ -254,33 +268,32 @@ class AddHistogramsTest(testing_common.TestCase): |
diag.put() |
data = json.dumps([ |
{ |
- 'benchmarkName': 'benchmark', |
- 'canonicalUrl': '', |
+ 'values': ['benchmark'], |
'guid': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- 'label': '', |
- 'legacyTIRLabel': '', |
- 'storyDisplayName': 'story', |
- 'type': 'TelemetryInfo' |
+ 'type': 'GenericSet', |
}, { |
'values': [424242], |
'guid': '25f0a111-9bb4-4cea-b0c1-af2609623160', |
'type': 'GenericSet', |
}, { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': 'buildbotmaster1', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['bot'], |
+ 'guid': '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ 'type': 'GenericSet' |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae' |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
}, |
'guid': '4989617a-14d6-4f80-8f75-dafda2ff13b0', |
'name': 'foo', |
@@ -292,21 +305,17 @@ class AddHistogramsTest(testing_common.TestCase): |
params_by_guid = self.TaskParamsByGuid() |
params = params_by_guid['4989617a-14d6-4f80-8f75-dafda2ff13b0'] |
hist = json.loads(params['data'][0]) |
- buildbot_info = hist['diagnostics']['buildbot'] |
- self.assertEqual(2, len(diagnostics)) |
- self.assertEqual('e9c2891d-2b04-413f-8cf4-099827e67626', buildbot_info) |
+ self.assertEqual(4, len(diagnostics)) |
+ self.assertEqual( |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ hist['diagnostics'][reserved_infos.MASTERS.name]) |
def testPostHistogram_DeduplicatesSameSparseDiagnostic(self): |
diag_dict = { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': 'buildbotmaster', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
- 'guid': '6ce177ab-3fdb-44cb-aa8d-9ed49765d810', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'values': ['master'], |
+ 'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ 'type': 'GenericSet' |
} |
diag = histogram.SparseDiagnostic( |
id='e9c2891d-2b04-413f-8cf4-099827e67626', data=diag_dict, |
@@ -315,33 +324,32 @@ class AddHistogramsTest(testing_common.TestCase): |
diag.put() |
data = json.dumps([ |
{ |
- 'benchmarkName': 'benchmark', |
- 'canonicalUrl': '', |
+ 'values': ['benchmark'], |
'guid': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- 'label': '', |
- 'legacyTIRLabel': '', |
- 'storyDisplayName': 'story', |
- 'type': 'TelemetryInfo' |
+ 'type': 'GenericSet', |
}, { |
'values': [424242], |
'guid': '25f0a111-9bb4-4cea-b0c1-af2609623160', |
'type': 'GenericSet', |
}, { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': 'buildbotmaster', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['bot'], |
+ 'guid': '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ 'type': 'GenericSet' |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae' |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
}, |
'guid': '4989617a-14d6-4f80-8f75-dafda2ff13b0', |
'name': 'foo', |
@@ -354,30 +362,26 @@ class AddHistogramsTest(testing_common.TestCase): |
params_by_guid = self.TaskParamsByGuid() |
params = params_by_guid['4989617a-14d6-4f80-8f75-dafda2ff13b0'] |
hist = json.loads(params['data'][0]) |
- buildbot_info = hist['diagnostics']['buildbot'] |
- self.assertEqual(1, len(diagnostics)) |
- self.assertEqual('6ce177ab-3fdb-44cb-aa8d-9ed49765d810', buildbot_info) |
+ self.assertEqual(3, len(diagnostics)) |
+ self.assertEqual( |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ hist['diagnostics'][reserved_infos.MASTERS.name]) |
def testPostHistogramFailsWithoutHistograms(self): |
data = json.dumps([ |
{ |
- 'benchmarkName': 'benchmark', |
- 'canonicalUrl': '', |
+ 'values': ['benchmark'], |
'guid': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- 'label': '', |
- 'legacyTIRLabel': '', |
- 'storyDisplayName': 'story', |
- 'type': 'TelemetryInfo' |
- }, { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': 'buildbotmaster1', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'type': 'GenericSet', |
+ }, { |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['bot'], |
+ 'guid': '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ 'type': 'GenericSet' |
} |
]) |
self.testapp.post('/add_histograms', {'data': data}, status=400) |
@@ -385,13 +389,9 @@ class AddHistogramsTest(testing_common.TestCase): |
def testPostHistogramFailsWithoutBuildbotInfo(self): |
data = json.dumps([ |
{ |
- 'benchmarkName': 'benchmark', |
- 'canonicalUrl': '', |
+ 'values': ['benchmark'], |
'guid': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- 'label': '', |
- 'legacyTIRLabel': '', |
- 'storyDisplayName': 'story', |
- 'type': 'TelemetryInfo' |
+ 'type': 'GenericSet' |
}, { |
'values': [424242], |
'guid': '25f0a111-9bb4-4cea-b0c1-af2609623160', |
@@ -401,7 +401,8 @@ class AddHistogramsTest(testing_common.TestCase): |
'diagnostics': { |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae' |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
}, |
'guid': '4989617a-14d6-4f80-8f75-dafda2ff13b0', |
'name': 'foo', |
@@ -413,27 +414,26 @@ class AddHistogramsTest(testing_common.TestCase): |
def testPostHistogramFailsWithoutChromiumCommit(self): |
data = json.dumps([ |
{ |
- 'benchmarkName': 'benchmark', |
- 'canonicalUrl': '', |
+ 'values': ['benchmark'], |
'guid': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- 'label': '', |
- 'legacyTIRLabel': '', |
- 'storyDisplayName': 'story', |
- 'type': 'TelemetryInfo' |
- }, { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': 'buildbotmaster1', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'type': 'GenericSet', |
+ }, { |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['bot'], |
+ 'guid': '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ 'type': 'GenericSet' |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae' |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
}, |
'guid': '4989617a-14d6-4f80-8f75-dafda2ff13b0', |
'name': 'foo', |
@@ -441,25 +441,27 @@ class AddHistogramsTest(testing_common.TestCase): |
]) |
self.testapp.post('/add_histograms', {'data': data}, status=400) |
- def testPostHistogramFailsWithoutTelemetryInfo(self): |
+ def testPostHistogramFailsWithoutBenchmark(self): |
data = json.dumps([ |
{ |
'values': [424242], |
'guid': '25f0a111-9bb4-4cea-b0c1-af2609623160', |
'type': 'GenericSet', |
}, { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': '', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['bot'], |
+ 'guid': '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ 'type': 'GenericSet' |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160' |
}, |
@@ -478,35 +480,34 @@ class AddHistogramsTest(testing_common.TestCase): |
'values': ['alice@chromium.org'] |
}, |
{ |
- 'benchmarkName': 'benchmark', |
- 'canonicalUrl': '', |
+ 'values': ['benchmark'], |
'guid': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- 'label': '', |
- 'legacyTIRLabel': '', |
- 'storyDisplayName': 'story', |
- 'type': 'TelemetryInfo' |
+ 'type': 'GenericSet', |
}, { |
'values': [424242], |
'guid': '25f0a111-9bb4-4cea-b0c1-af2609623160', |
'type': 'GenericSet', |
}, { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': 'buildbotmaster1', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['bot'], |
+ 'guid': '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ 'type': 'GenericSet' |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.OWNERS.name: |
+ 'cabb59fe-4bcf-4512-881c-d038c7a80635', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- reserved_infos.OWNERS.name: |
- 'cabb59fe-4bcf-4512-881c-d038c7a80635' |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
}, |
'guid': '4989617a-14d6-4f80-8f75-dafda2ff13b0', |
'name': 'foo', |
@@ -521,9 +522,15 @@ class AddHistogramsTest(testing_common.TestCase): |
params = params_by_guid['4989617a-14d6-4f80-8f75-dafda2ff13b0'] |
hist = json.loads(params['data'][0]) |
owners_info = hist['diagnostics'][reserved_infos.OWNERS.name] |
- self.assertEqual(2, len(diagnostics)) |
- self.assertEqual(reserved_infos.OWNERS.name, diagnostics[0].name) |
- self.assertEqual(['alice@chromium.org'], diagnostics[0].data['values']) |
+ self.assertEqual(4, len(diagnostics)) |
+ self.assertEqual(reserved_infos.BENCHMARKS.name, diagnostics[0].name) |
+ self.assertEqual(reserved_infos.BOTS.name, diagnostics[1].name) |
+ self.assertEqual(reserved_infos.OWNERS.name, diagnostics[2].name) |
+ self.assertEqual(reserved_infos.MASTERS.name, diagnostics[3].name) |
+ self.assertEqual(['benchmark'], diagnostics[0].data['values']) |
+ self.assertEqual(['bot'], diagnostics[1].data['values']) |
+ self.assertEqual(['alice@chromium.org'], diagnostics[2].data['values']) |
+ self.assertEqual(['master'], diagnostics[3].data['values']) |
self.assertEqual('cabb59fe-4bcf-4512-881c-d038c7a80635', owners_info) |
def testPostHistogram_AddsSparseDiagnosticByName_OnlyOnce(self): |
@@ -534,33 +541,32 @@ class AddHistogramsTest(testing_common.TestCase): |
'values': ['alice@chromium.org'] |
}, |
{ |
- 'benchmarkName': 'benchmark', |
- 'canonicalUrl': '', |
+ 'values': ['benchmark'], |
'guid': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- 'label': '', |
- 'legacyTIRLabel': '', |
- 'storyDisplayName': 'story', |
- 'type': 'TelemetryInfo' |
+ 'type': 'GenericSet', |
}, { |
'values': [424242], |
'guid': '25f0a111-9bb4-4cea-b0c1-af2609623160', |
'type': 'GenericSet' |
}, { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': 'buildbotmaster1', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['bot'], |
+ 'guid': '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ 'type': 'GenericSet' |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
reserved_infos.OWNERS.name: |
'cabb59fe-4bcf-4512-881c-d038c7a80635' |
}, |
@@ -570,12 +576,16 @@ class AddHistogramsTest(testing_common.TestCase): |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
reserved_infos.OWNERS.name: |
- 'cabb59fe-4bcf-4512-881c-d038c7a80635' |
+ 'cabb59fe-4bcf-4512-881c-d038c7a80635', |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
}, |
'guid': '5239617a-14d6-4f80-8f75-dafda2ff13b1', |
'name': 'bar', |
@@ -586,9 +596,9 @@ class AddHistogramsTest(testing_common.TestCase): |
diagnostics = histogram.SparseDiagnostic.query().fetch() |
- self.assertEqual(2, len(diagnostics)) |
- self.assertEqual(reserved_infos.OWNERS.name, diagnostics[0].name) |
- self.assertNotEqual(reserved_infos.OWNERS.name, diagnostics[1].name) |
+ self.assertEqual(4, len(diagnostics)) |
+ self.assertEqual(reserved_infos.BOTS.name, diagnostics[1].name) |
+ self.assertNotEqual(reserved_infos.BOTS.name, diagnostics[0].name) |
def testPostHistogram_AddsSparseDiagnosticByName_ErrorsIfDiverging(self): |
data = json.dumps([ |
@@ -601,33 +611,32 @@ class AddHistogramsTest(testing_common.TestCase): |
'guid': '7c5bd92f-4146-411b-9192-248ffc1be92c', |
'values': ['bob@chromium.org'] |
}, { |
- 'benchmarkName': 'benchmark', |
- 'canonicalUrl': '', |
+ 'values': ['benchmark'], |
'guid': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
- 'label': '', |
- 'legacyTIRLabel': '', |
- 'storyDisplayName': 'story', |
- 'type': 'TelemetryInfo' |
+ 'type': 'GenericSet' |
}, { |
'values': [424242], |
'guid': '25f0a111-9bb4-4cea-b0c1-af2609623160', |
'type': 'GenericSet' |
}, { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': 'buildbotmaster1', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
+ }, { |
+ 'values': ['bot'], |
+ 'guid': '53fb5448-9f8d-407a-8891-e7233fe1740f', |
+ 'type': 'GenericSet' |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
reserved_infos.OWNERS.name: |
'cabb59fe-4bcf-4512-881c-d038c7a80635' |
}, |
@@ -637,10 +646,14 @@ class AddHistogramsTest(testing_common.TestCase): |
}, { |
'binBoundaries': [1, [1, 1000, 20]], |
'diagnostics': { |
- 'buildbot': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.MASTERS.name: |
+ 'e9c2891d-2b04-413f-8cf4-099827e67626', |
+ reserved_infos.BOTS.name: |
+ '53fb5448-9f8d-407a-8891-e7233fe1740f', |
reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: |
'25f0a111-9bb4-4cea-b0c1-af2609623160', |
- 'telemetry': '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
+ reserved_infos.BENCHMARKS.name: |
+ '0bc1021b-8107-4db7-bc8c-49d7cf53c5ae', |
reserved_infos.OWNERS.name: |
'7c5bd92f-4146-411b-9192-248ffc1be92c' |
}, |
@@ -658,27 +671,29 @@ class AddHistogramsTest(testing_common.TestCase): |
histograms = histogram_set.HistogramSet([hist]) |
histograms.AddSharedDiagnostic('foo', histogram_module.GenericSet(['bar'])) |
histograms.AddSharedDiagnostic( |
- 'telemetry', histogram_module.TelemetryInfo()) |
+ reserved_infos.GPUS.name, |
+ histogram_module.GenericSet([])) |
diagnostics = add_histograms.FindHistogramLevelSparseDiagnostics( |
hist.guid, histograms) |
self.assertEqual(1, len(diagnostics)) |
- self.assertIsInstance(diagnostics[0], histogram_module.TelemetryInfo) |
+ self.assertIsInstance(diagnostics[0], histogram_module.GenericSet) |
def testComputeTestPathWithStory(self): |
hist = histogram_module.Histogram('hist', 'count') |
histograms = histogram_set.HistogramSet([hist]) |
- telemetry_info = histogram_module.TelemetryInfo() |
- telemetry_info.AddInfo({ |
- 'storyDisplayName': 'story', |
- 'benchmarkName': 'benchmark' |
- }) |
- histograms.AddSharedDiagnostic('telemetry', telemetry_info) |
- buildbot_info = histogram_module.BuildbotInfo({ |
- 'displayMasterName': 'master', |
- 'displayBotName': 'bot' |
- }) |
- histograms.AddSharedDiagnostic('buildbot', buildbot_info) |
+ histograms.AddSharedDiagnostic( |
+ reserved_infos.MASTERS.name, |
+ histogram_module.GenericSet(['master'])) |
+ histograms.AddSharedDiagnostic( |
+ reserved_infos.BOTS.name, |
+ histogram_module.GenericSet(['bot'])) |
+ histograms.AddSharedDiagnostic( |
+ reserved_infos.BENCHMARKS.name, |
+ histogram_module.GenericSet(['benchmark'])) |
+ histograms.AddSharedDiagnostic( |
+ reserved_infos.STORIES.name, |
+ histogram_module.GenericSet(['story'])) |
hist = histograms.GetFirstHistogram() |
test_path = add_histograms.ComputeTestPath(hist.guid, histograms) |
self.assertEqual('master/bot/benchmark/hist/story', test_path) |
@@ -686,16 +701,15 @@ class AddHistogramsTest(testing_common.TestCase): |
def testComputeTestPathWithoutStory(self): |
hist = histogram_module.Histogram('hist', 'count') |
histograms = histogram_set.HistogramSet([hist]) |
- telemetry_info = histogram_module.TelemetryInfo() |
- telemetry_info.AddInfo({ |
- 'benchmarkName': 'benchmark' |
- }) |
- histograms.AddSharedDiagnostic('telemetry', telemetry_info) |
- buildbot_info = histogram_module.BuildbotInfo({ |
- 'displayMasterName': 'master', |
- 'displayBotName': 'bot' |
- }) |
- histograms.AddSharedDiagnostic('buildbot', buildbot_info) |
+ histograms.AddSharedDiagnostic( |
+ reserved_infos.MASTERS.name, |
+ histogram_module.GenericSet(['master'])) |
+ histograms.AddSharedDiagnostic( |
+ reserved_infos.BOTS.name, |
+ histogram_module.GenericSet(['bot'])) |
+ histograms.AddSharedDiagnostic( |
+ reserved_infos.BENCHMARKS.name, |
+ histogram_module.GenericSet(['benchmark'])) |
hist = histograms.GetFirstHistogram() |
test_path = add_histograms.ComputeTestPath(hist.guid, histograms) |
self.assertEqual('master/bot/benchmark/hist', test_path) |
@@ -720,27 +734,17 @@ class AddHistogramsTest(testing_common.TestCase): |
def testSparseDiagnosticsAreNotInlined(self): |
hist = histogram_module.Histogram('hist', 'count') |
histograms = histogram_set.HistogramSet([hist]) |
- histograms.AddSharedDiagnostic('foo', histogram_module.BuildbotInfo({ |
- 'displayMasterName': 'dmn', |
- 'displayBotName': 'dbn', |
- 'buildbotMasterName': 'bbmn', |
- 'buildbotName': 'bbn', |
- 'buildNumber': 42, |
- 'logUri': 'uri', |
- })) |
+ histograms.AddSharedDiagnostic( |
+ reserved_infos.BENCHMARKS.name, |
+ histogram_module.GenericSet(['benchmark'])) |
add_histograms.InlineDenseSharedDiagnostics(histograms) |
- self.assertTrue(hist.diagnostics['foo'].has_guid) |
+ self.assertTrue(hist.diagnostics[reserved_infos.BENCHMARKS.name].has_guid) |
def testDeduplicateAndPut_Same(self): |
d = { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': '', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
} |
test_key = utils.TestKey('Chromium/win7/foo') |
entity = histogram.SparseDiagnostic( |
@@ -754,18 +758,13 @@ class AddHistogramsTest(testing_common.TestCase): |
start_revision=2, end_revision=sys.maxint, id='def') |
add_histograms.DeduplicateAndPut([entity2], test_key, 2) |
sparse = histogram.SparseDiagnostic.query().fetch() |
- self.assertEqual(1, len(sparse)) |
+ self.assertEqual(2, len(sparse)) |
def testDeduplicateAndPut_Different(self): |
d = { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': '', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
} |
test_key = utils.TestKey('Chromium/win7/foo') |
entity = histogram.SparseDiagnostic( |
@@ -784,14 +783,9 @@ class AddHistogramsTest(testing_common.TestCase): |
def testDeduplicateAndPut_New(self): |
d = { |
- 'buildNumber': 0, |
- 'buildbotMasterName': '', |
- 'buildbotName': '', |
- 'displayBotName': 'bot', |
- 'displayMasterName': 'master', |
+ 'values': ['master'], |
'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626', |
- 'logUri': '', |
- 'type': 'BuildbotInfo' |
+ 'type': 'GenericSet' |
} |
test_key = utils.TestKey('Chromium/win7/foo') |
entity = histogram.SparseDiagnostic( |