Updating perf recipe for disabled chartjson data.

scripts/slave/unittests/runtest_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Unit tests for functions in runtest.py."""
 
 import unittest
 
 import test_env  # pylint: disable=W0403,W0611
@@ skipping 113 matching lines @@
   # Also, this test method doesn't reference self.
   # pylint: disable=W0212,R0201
   @mock.patch('slave.runtest._GetDataFromLogProcessor')
   @mock.patch('slave.results_dashboard.MakeListOfPoints')
   @mock.patch('slave.results_dashboard.SendResults')
   def test_SendResultsToDashboard_SimpleCase(
       self, SendResults, MakeListOfPoints, GetDataFromLogProcessor):
     """Tests that the right methods get called in _SendResultsToDashboard."""
     # Since this method just tests that certain methods get called when
     # a call to _SendResultsDashboard is made, the data used below is arbitrary.
-    fake_charts_data = {'chart': {'traces': {'x': [1, 0]}, 'rev': 1000}}
+    fake_charts_data = \
+      {'chart': {'traces': {'x': [1, 0]}, 'rev': 1000}}

[perezju, 2016/09/22 08:50:27]

why this change?

[eyaich1, 2016/09/26 15:22:11]

Not sure. Done.

     fake_points_data = [{'test': 'master/bot/chart/x', 'revision': 1000}]
     fake_results_tracker = mock.Mock()
     fake_results_tracker.IsChartJson = mock.MagicMock(return_value=False)
     GetDataFromLogProcessor.return_value = fake_charts_data
     MakeListOfPoints.return_value = fake_points_data
 
     result = runtest._SendResultsToDashboard(
         fake_results_tracker, {
             'system': 'linux',
             'test': 'sunspider',
@@ skipping 14 matching lines @@
     # Then a function is called to send the data (and any cached data).
     SendResults.assert_called_with(
         fake_points_data, 'http://x.com', 'builddir')
 
     # No errors, should return True.
     self.assertTrue(result)
 
   @mock.patch('slave.results_dashboard.MakeDashboardJsonV1')
   @mock.patch('slave.results_dashboard.SendResults')
   def test_SendResultsToDashboard_Telemetry(
       self, SendResults, MakeDashboardJsonV1):

[perezju, 2016/09/22 08:50:27]

Also add a test case showing that data is not sent if the benchmark was
disabled.

[eyaich1, 2016/09/26 15:22:11]

Done.

     """Tests that the right methods get called in _SendResultsToDashboard."""
     # Since this method just tests that certain methods get called when
     # a call to _SendResultsDashboard is made, the data used below is arbitrary.
-    fake_json_data = {'chart': {'traces': {'x': [1, 0]}, 'rev': 1000}}
+    fake_json_data = \
+      {'chart': {'traces': {'x': [1, 0]}, 'rev': 1000}, 'disabled': False}

[perezju, 2016/09/22 08:50:27]

The style guide discourages the use of backslash for line continuation:
http://google.github.io/styleguide/pyguide.html#Line_length

Break the line after the first "{" instead.

[eyaich1, 2016/09/26 15:22:11]

Done.

     fake_results_tracker = mock.Mock()
     fake_results_tracker.IsChartJson = mock.MagicMock(return_value=True)
     fake_results_tracker.ChartJson = mock.MagicMock(return_value=fake_json_data)
     fake_results_tracker.IsReferenceBuild = mock.MagicMock(return_value=False)
     fake_results_tracker.Cleanup = mock.MagicMock()
-    MakeDashboardJsonV1.return_value = {'doesnt': 'matter'}
+    MakeDashboardJsonV1.return_value = (False, {'doesnt': 'matter'})
 
     result = runtest._SendResultsToDashboard(
         fake_results_tracker, {
             'system': 'linux',
             'test': 'sunspider',
             'url': 'http://x.com',
             'build_dir': 'builddir',
             'mastername': 'my.master',
             'buildername': 'Builder',
             'buildnumber': 123,
@@ skipping 53 matching lines @@
         'git_revision': '9a7b354',
     }
     versions = runtest._GetTelemetryRevisions(options)
     self.assertEqual(
         {'rev': '294850', 'webkit_rev': '34f9d01', 'git_revision': '9a7b354',
          'point_id': 1470050195},
         versions)
 
 if __name__ == '__main__':
   unittest.main()