DeviceInfo into GenericSets

dashboard/dashboard/add_histograms_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 base64
 import json
 import mock
 import sys
 import urlparse
 import webapp2
@@ skipping 567 matching lines @@
         'buildbotMasterName': 'bbmn',
         'buildbotName': 'bbn',
         'buildNumber': 42,
         'logUri': 'uri',
     }))
     add_histograms.InlineDenseSharedDiagnostics(histograms)
     self.assertTrue(hist.diagnostics['foo'].has_guid)
 
   def testDeduplicateAndPut_Same(self):
     d = {
-        'guid': 'abc',
-        'osName': 'linux',
-        'type': 'DeviceInfo'
+        'buildNumber': 0,
+        'buildbotMasterName': '',
+        'buildbotName': '',
+        'displayBotName': 'bot',
+        'displayMasterName': 'master',
+        'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626',
+        'logUri': '',
+        'type': 'BuildbotInfo'
     }
     test_key = utils.TestKey('Chromium/win7/foo')
     entity = histogram.SparseDiagnostic(
         data=d, test=test_key, start_revision=1,
         end_revision=sys.maxint, id='abc')
     entity.put()
     d2 = d.copy()
     d2['guid'] = 'def'
     entity2 = histogram.SparseDiagnostic(
         data=d2, test=test_key,
         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))
 
   def testDeduplicateAndPut_Different(self):
     d = {
-        'guid': 'abc',
-        'osName': 'linux',
-        'type': 'DeviceInfo'
+        'buildNumber': 0,
+        'buildbotMasterName': '',
+        'buildbotName': '',
+        'displayBotName': 'bot',
+        'displayMasterName': 'master',
+        'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626',
+        'logUri': '',
+        'type': 'BuildbotInfo'
     }
     test_key = utils.TestKey('Chromium/win7/foo')
     entity = histogram.SparseDiagnostic(
         data=d, test=test_key, start_revision=1,
         end_revision=sys.maxint, id='abc')
     entity.put()
     d2 = d.copy()
     d2['guid'] = 'def'
-    d2['osName'] = 'mac'
+    d2['displayBotName'] = 'mac'
     entity2 = histogram.SparseDiagnostic(
         data=d2, test=test_key,
         start_revision=1, end_revision=sys.maxint, id='def')
     add_histograms.DeduplicateAndPut([entity2], test_key, 2)
     sparse = histogram.SparseDiagnostic.query().fetch()
     self.assertEqual(2, len(sparse))
 
   def testDeduplicateAndPut_New(self):
     d = {
-        'guid': 'abc',
-        'osName': 'linux',
-        'type': 'DeviceInfo'
+        'buildNumber': 0,
+        'buildbotMasterName': '',
+        'buildbotName': '',
+        'displayBotName': 'bot',
+        'displayMasterName': 'master',
+        'guid': 'e9c2891d-2b04-413f-8cf4-099827e67626',
+        'logUri': '',
+        'type': 'BuildbotInfo'
     }
     test_key = utils.TestKey('Chromium/win7/foo')
     entity = histogram.SparseDiagnostic(
         data=d, test=test_key, start_revision=1,
         end_revision=sys.maxint, id='abc')
     entity.put()
     add_histograms.DeduplicateAndPut([entity], test_key, 1)
     sparse = histogram.SparseDiagnostic.query().fetch()
     self.assertEqual(1, len(sparse))