DeviceInfo into GenericSets

dashboard/dashboard/add_histograms_test.py

Index: dashboard/dashboard/add_histograms_test.py
diff --git a/dashboard/dashboard/add_histograms_test.py b/dashboard/dashboard/add_histograms_test.py
index 90133be2428e115721ece67ff1a555aa262c7beb..1d5c9dbb8459b77d8a5077dfeb9857a28963f8dc 100644
--- a/dashboard/dashboard/add_histograms_test.py
+++ b/dashboard/dashboard/add_histograms_test.py
@@ -585,9 +585,14 @@ class AddHistogramsTest(testing_common.TestCase):
 
   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(
@@ -605,9 +610,14 @@ class AddHistogramsTest(testing_common.TestCase):
 
   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(
@@ -616,7 +626,7 @@ class AddHistogramsTest(testing_common.TestCase):
     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')
@@ -626,9 +636,14 @@ class AddHistogramsTest(testing_common.TestCase):
 
   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(