Make add_histograms use reserved GenericSet names.

dashboard/dashboard/add_histograms_queue_test.py

 # Copyright 2017 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import copy
 import json
 import sys
 import webapp2
 import webtest
 
@@ skipping 16 matching lines @@
     'diagnostics': {
         reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: {
             'values': [123],
             'type': 'GenericSet'
         },
         reserved_infos.V8_REVISIONS.name: {
             'values': ['4cd34ad3320db114ad3a2bd2acc02aba004d0cb4'],
             'type': 'GenericSet'
         },
         'owners': '68e5b3bd-829c-4f4f-be3a-98a94279ccf0',
-        'telemetry': 'ec2c0cdc-cd9f-4736-82b4-6ffc3d76e3eb'
+        'benchmarks': 'ec2c0cdc-cd9f-4736-82b4-6ffc3d76e3eb'
     },
     'guid': 'c2c0fa00-060f-4d56-a1b7-51fde4767584',
     'name': 'foo',
     'running': [3, 3, 0.5972531564093516, 2, 1, 6, 2],
     'sampleValues': [1, 2, 3],
     'unit': 'count_biggerIsBetter'
 }
 
 
-TEST_TELEMETRY_INFO = {
+TEST_BENCHMARKS = {
     'guid': 'ec2c0cdc-cd9f-4736-82b4-6ffc3d76e3eb',
-    'benchmarkName': 'myBenchmark',
-    'canonicalUrl': 'myCanonicalUrl',
-    'label': 'myLabel',
-    'legacyTIRLabel': 'myLegacyTIRLabel',
-    'storyDisplayName': 'myStoryDisplayName',
-    'type': 'TelemetryInfo'
+    'values': ['myBenchmark'],
+    'type': 'GenericSet',
 }
 
 
 TEST_OWNERS = {
     'guid': '68e5b3bd-829c-4f4f-be3a-98a94279ccf0',
     'values': ['abc@chromium.org'],
     'type': 'GenericSet'
 }
 
 
@@ skipping 72 matching lines @@
     self.assertEqual(1, len(rows))
 
   def testPostHistogram_WithFreshDiagnostics(self):
     stored_object.Set(
         add_point_queue.BOT_WHITELIST_KEY, ['win7'])
     test_path = 'Chromium/win7/suite/metric'
     params = {
         'data': json.dumps(TEST_HISTOGRAM),
         'test_path': test_path,
         'revision': 123,
-        'diagnostics': json.dumps([TEST_TELEMETRY_INFO, TEST_OWNERS])
+        'diagnostics': json.dumps([TEST_BENCHMARKS, TEST_OWNERS])
     }
     self.testapp.post('/add_histograms_queue', params)
     histogram_entity = histogram.Histogram.query().fetch()[0]
     hist = histogram_module.Histogram.FromDict(histogram_entity.data)
     self.assertEqual(
         'ec2c0cdc-cd9f-4736-82b4-6ffc3d76e3eb',
-        hist.diagnostics['telemetry'].guid)
+        hist.diagnostics[reserved_infos.BENCHMARKS.name].guid)
     self.assertEqual(
         '68e5b3bd-829c-4f4f-be3a-98a94279ccf0',
         hist.diagnostics['owners'].guid)
     telemetry_info_entity = ndb.Key(
-        'SparseDiagnostic', TEST_TELEMETRY_INFO['guid']).get()
+        'SparseDiagnostic', TEST_BENCHMARKS['guid']).get()
     ownership_entity = ndb.Key(
         'SparseDiagnostic', TEST_OWNERS['guid']).get()
     self.assertFalse(telemetry_info_entity.internal_only)
     self.assertFalse(ownership_entity.internal_only)
 
   def testPostHistogram_WithSameDiagnostic(self):
     diag_dict = {
         'guid': '05341937-1272-4214-80ce-43b2d03807f9',
-        'benchmarkName': 'myBenchmark',
-        'canonicalUrl': 'myCanonicalUrl',
-        'label': 'myLabel',
-        'legacyTIRLabel': 'myLegacyTIRLabel',
-        'storyDisplayName': 'myStoryDisplayName',
-        'type': 'TelemetryInfo'
+        'values': ['myBenchmark'],
+        'type': 'GenericSet',
     }
     diag = histogram.SparseDiagnostic(
         data=diag_dict, start_revision=1, end_revision=sys.maxint,
         test=utils.TestKey('Chromium/win7/suite/metric'))
     diag.put()
     stored_object.Set(
         add_point_queue.BOT_WHITELIST_KEY, ['win7'])
     test_path = 'Chromium/win7/suite/metric'
     params = {
         'data': json.dumps(TEST_HISTOGRAM),
         'test_path': test_path,
         'revision': 123,
-        'diagnostics': json.dumps([TEST_TELEMETRY_INFO, TEST_OWNERS])
+        'diagnostics': json.dumps([TEST_BENCHMARKS, TEST_OWNERS])
     }
     self.testapp.post('/add_histograms_queue', params)
     histogram_entity = histogram.Histogram.query().fetch()[0]
     hist = histogram_module.Histogram.FromDict(histogram_entity.data)
     self.assertEqual(
-        '05341937-1272-4214-80ce-43b2d03807f9',
-        hist.diagnostics['telemetry'].guid)
+        TEST_BENCHMARKS['guid'],
+        hist.diagnostics[reserved_infos.BENCHMARKS.name].guid)
     diagnostics = histogram.SparseDiagnostic.query().fetch()
-    self.assertEqual(len(diagnostics), 2)
+    self.assertEqual(len(diagnostics), 3)
 
   def testPostHistogram_WithDifferentDiagnostic(self):
     diag_dict = {
         'guid': 'c397a1a0-e289-45b2-abe7-29e638e09168',
         'values': ['def@chromium.org'],
         'type': 'GenericSet'
     }
     diag = histogram.SparseDiagnostic(
         data=diag_dict, start_revision=1, end_revision=sys.maxint,
         test=utils.TestKey('Chromium/win7/suite/metric'))
     diag.put()
     stored_object.Set(
         add_point_queue.BOT_WHITELIST_KEY, ['win7'])
     test_path = 'Chromium/win7/suite/metric'
     params = {
         'data': json.dumps(TEST_HISTOGRAM),
         'test_path': test_path,
         'revision': 123,
-        'diagnostics': json.dumps([TEST_TELEMETRY_INFO, TEST_OWNERS])
+        'diagnostics': json.dumps([TEST_BENCHMARKS, TEST_OWNERS])
     }
     self.testapp.post('/add_histograms_queue', params)
     histogram_entity = histogram.Histogram.query().fetch()[0]
     hist = histogram_module.Histogram.FromDict(histogram_entity.data)
     self.assertEqual(
         '68e5b3bd-829c-4f4f-be3a-98a94279ccf0',
         hist.diagnostics['owners'].guid)
     diagnostics = histogram.SparseDiagnostic.query().fetch()
     self.assertEqual(len(diagnostics), 3)
 
   def testPostSparseDiagnostic(self):
     stored_object.Set(
         add_point_queue.BOT_WHITELIST_KEY, ['win7'])
 
     test_path = 'Chromium/win7/suite/metric'
     params = {
-        'data': json.dumps(TEST_TELEMETRY_INFO),
+        'data': json.dumps(TEST_BENCHMARKS),
         'test_path': test_path,
         'revision': 123
     }
     self.testapp.post('/add_histograms_queue', params)
 
     test_key = utils.TestKey(test_path)
 
     test = test_key.get()
     self.assertIsNone(test.units)
 
-    original_diagnostic = TEST_TELEMETRY_INFO
+    original_diagnostic = TEST_BENCHMARKS
     diagnostic_entity = ndb.Key(
         'SparseDiagnostic', original_diagnostic['guid']).get()
     self.assertFalse(diagnostic_entity.internal_only)
 
   def testPostSparseDiagnostic_Internal(self):
     stored_object.Set(
         add_point_queue.BOT_WHITELIST_KEY, ['mac'])
 
     test_path = 'Chromium/win7/suite/metric'
     test_key = utils.TestKey(test_path)
 
     params = {
-        'data': json.dumps(TEST_TELEMETRY_INFO),
+        'data': json.dumps(TEST_BENCHMARKS),
         'test_path': test_path,
         'revision': 123
     }
     self.testapp.post('/add_histograms_queue', params)
 
     test = test_key.get()
     self.assertIsNone(test.units)
 
-    original_diagnostic = TEST_TELEMETRY_INFO
+    original_diagnostic = TEST_BENCHMARKS
     diagnostic_entity = ndb.Key(
         'SparseDiagnostic', original_diagnostic['guid']).get()
     self.assertTrue(diagnostic_entity.internal_only)
 
   def testGetUnitArgs_Up(self):
     unit_args = add_histograms_queue.GetUnitArgs('count_biggerIsBetter')
     self.assertEquals(anomaly.UP, unit_args['improvement_direction'])
 
   def testGetUnitArgs_Down(self):
     unit_args = add_histograms_queue.GetUnitArgs('count_smallerIsBetter')
@@ skipping 72 matching lines @@
 
   def testAddRow_FailsWithNonSingularRevisionInfo(self):
     test_path = 'Chromium/win7/suite/metric'
     test_key = utils.TestKey(test_path)
     hist = copy.deepcopy(TEST_HISTOGRAM)
     hist['diagnostics'][reserved_infos.CATAPULT_REVISIONS.name] = {
         'type': 'GenericSet', 'values': [123, 456]}
 
     with self.assertRaises(add_histograms_queue.BadRequestError):
       add_histograms_queue.AddRow(hist, test_key, 123, test_path, False)