Update buildbots to parse new telemetry JSON format.

scripts/slave/unittests/results_dashboard_test.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Test cases for results_dashboard."""
 
 import datetime
 import json
 import os
@@ skipping 21 matching lines @@
   """Tests related to functions which convert data format."""
 
   def setUp(self):
     super(ResultsDashboardFormatTest, self).setUp()
     self.mox = mox.Mox()
     self.maxDiff = None
 
   def tearDown(self):
     self.mox.UnsetStubs()
 
+  def test_MakeDashboardJsonV1(self):
+    self.mox.StubOutWithMock(slave_utils, 'GetActiveMaster')
+    slave_utils.GetActiveMaster().AndReturn('ChromiumPerf')
+    self.mox.StubOutWithMock(results_dashboard, '_GetTimestamp')
+    # pylint: disable=W0212
+    results_dashboard._GetTimestamp().AndReturn(12345)
+    results_dashboard._GetTimestamp().AndReturn(12345)
+    self.mox.ReplayAll()
+    v1json = results_dashboard.MakeDashboardJsonV1(
+        {'some_json': 'from_telemetry'},
+        {'rev': 'f46bf3c', 'git_revision': 'f46bf3c', 'v8_rev': '73a34f'},
+        'win7', 'chromium.perf', 'Windows Builder (1)', '432', {'x': 'y'},
+        True)
+    self.assertEqual({
+        'master': 'ChromiumPerf',
+        'masterid': 'chromium.perf',
+        'bot': 'win7',
+        'buildername': 'Windows Builder (1)',
+        'buildnumber': '432',
+        'chart_data': {'some_json': 'from_telemetry'},
+        'is_ref': True,
+        'point_id': 12345,
+        'supplemental': {'default_rev': 'r_chromium', 'x': 'y'},
+        'versions': {'v8_rev': '73a34f', 'chromium': 'f46bf3c'}},
+        v1json)
+
   def test_MakeListOfPoints_MinimalCase(self):
     """A very simple test of a call to MakeListOfPoints."""
 
     # The master name is gotten when making the list of points,
     # so it must be stubbed out here.
     self.mox.StubOutWithMock(slave_utils, 'GetActiveMaster')
     slave_utils.GetActiveMaster().AndReturn('MyMaster')
     self.mox.ReplayAll()
 
     actual_points = results_dashboard.MakeListOfPoints(
@@ skipping 246 matching lines @@
       else:
         urllib2.urlopen(IsEncodedJson(json_line))
     self.mox.ReplayAll()
     results_dashboard.SendResults(new_data, 'https:/x.com', self.build_dir)
     self.mox.VerifyAll()
 
   def test_FailureRetried(self):
     """After failing once, the same JSON is sent the next time."""
     # First, some data is sent but it fails for some reason.
     self._TestSendResults(
-        {'sample': 1},
-        ['{"sample": 1}'],
+        {'sample': 1, 'master': 'm', 'bot': 'b',
+         'chart_data': {'benchmark_name': 'b'}, 'point_id': 1234},
+        [('{"sample": 1, "master": "m", "bot": "b", '
+          '"chart_data": {"benchmark_name": "b"}, "point_id": 1234}')],
         [urllib2.URLError('some reason')])
 
     # The next time, the old data is sent with the new data.
     self._TestSendResults(
-        {'sample': 2},
-        ['{"sample": 1}', '{"sample": 2}'],
+        {'sample': 2, 'master': 'm2', 'bot': 'b2',
+         'chart_data': {'benchmark_name': 'b'}, 'point_id': 1234},
+        [('{"sample": 1, "master": "m", "bot": "b", '
+          '"chart_data": {"benchmark_name": "b"}, "point_id": 1234}'),
+         ('{"sample": 2, "master": "m2", "bot": "b2", '
+          '"chart_data": {"benchmark_name": "b"}, "point_id": 1234}')],
         [None, None])
 
   def test_SuccessNotRetried(self):
     """After being successfully sent, data is not re-sent."""
     # First, some data is sent.
     self._TestSendResults(
-        {'sample': 1},
-        ['{"sample": 1}'],
+        {'sample': 1, 'master': 'm', 'bot': 'b',
+         'chart_data': {'benchmark_name': 'b'}, 'point_id': 1234},
+        [('{"sample": 1, "master": "m", "bot": "b", '
+          '"chart_data": {"benchmark_name": "b"}, "point_id": 1234}')],
         [None])
 
     # The next time, the old data is not sent with the new data.
     self._TestSendResults(
-        {'sample': 2},
-        ['{"sample": 2}'],
+        {'sample': 2, 'master': 'm2', 'bot': 'b2',
+         'chart_data': {'benchmark_name': 'b'}, 'point_id': 1234},
+        [('{"sample": 2, "master": "m2", "bot": "b2", '
+          '"chart_data": {"benchmark_name": "b"}, "point_id": 1234}')],
         [None])
 
 
 class ResultsDashboardTest(unittest.TestCase):
   """Tests for other functions in results_dashboard."""
 
   # Testing private method.
   # pylint: disable=W0212
   def test_LinkAnnotation_WithData(self):
     self.assertEqual(
         ('@@@STEP_LINK@Results Dashboard@'
          'https://chromeperf.appspot.com/report'
          '?masters=MyMaster&bots=b&tests=sunspider&rev=1234@@@'),
         results_dashboard._LinkAnnotation(
             'https://chromeperf.appspot.com',
             [{
                 'master': 'MyMaster',
                 'bot': 'b',
                 'test': 'sunspider/Total',
                 'revision': 1234,
                 'value': 10,
             }]))
 
   def test_LinkAnnotation_UnexpectedData(self):
     self.assertIsNone(results_dashboard._LinkAnnotation('', {}))
 
 
 if __name__ == '__main__':
   unittest.main()