Updating the SwarmingIsolatedScriptTest to upload chartjson results to the

scripts/slave/unittests/slave_utils_test.py

 #!/usr/bin/env python
 # Copyright 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.
 
 import os
 import sys
 import unittest
 
 import test_env  # pylint: disable=W0403,W0611
 
 import mock
 import slave.slave_utils as slave_utils
 from common import chromium_utils
 
 # build/scripts/slave/unittests
 _SCRIPT_DIR = os.path.dirname(__file__)
 _BUILD_DIR = os.path.abspath(os.path.join(
     _SCRIPT_DIR, os.pardir, os.pardir))
 
+
+# Note: The git-svn id / cr pos is intentionally modified.
+# Also commit messages modified to be < 80 char.
+CHROMIUM_LOG = """
+Update GPU rasterization device whitelist
+
+This replaces the whitelisting of all Qualcomm GPUs on
+Android 4.4 with whitelisting all Android 4.4 devices
+with GL ES version >= 3.0.
+
+BUG=405646
+
+Review URL: https://codereview.chromium.org/468103003
+
+Cr-Commit-Position: refs/heads/master@{#291141}
+git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291140 0039d316-1c4b-4281
+"""
+
+BLINK_LOG = """
+[Sheriff-o-matic] Remove race condition on the commit list.
+
+By always modifying the same list of commits, we ensure that data binding
+
+As well, renamed "revisionLog" to "commitLog" everywhere, to better reflect
+
+BUG=405327
+NOTRY=true
+
+Review URL: https://codereview.chromium.org/485253004
+
+git-svn-id: svn://svn.chromium.org/blink/trunk@180728 bbb929c8-8fbe-4397-9dbb-9
+"""
+
+
 class TestGetZipFileNames(unittest.TestCase):
   def setUp(self):
     super(TestGetZipFileNames, self).setUp()
     chromium_utils.OverridePlatformName(sys.platform)
 
   def testNormalBuildName(self):
     (base_name, version_suffix) = slave_utils.GetZipFileNames(
         '', None, None, 123)
     self._verifyBaseName(base_name)
     self.assertEqual('_123', version_suffix)
@@ skipping 55 matching lines @@
       cache_control='mock_cache')
     run_command_mock.assert_called_with(['/mock/gsutil', '-h',
       'Cache-Control:mock_cache', 'cp', 'file://foo',
       'file://bar/foo'])
     slave_utils.GSUtilCopyDir('foo', 'bar',
       cache_control='mock_cache')
     run_command_mock.assert_called_with(['/mock/gsutil', '-m', '-h',
       'Cache-Control:mock_cache', 'cp', '-R', 'foo', 'bar'])
 
 
+class GetGitRevisionTest(unittest.TestCase):
+  """Tests related to getting revisions from a directory."""
+  def test_GitSvnCase(self):
+    # pylint: disable=W0212
+    self.assertEqual(slave_utils._GetGitCommitPositionFromLog(CHROMIUM_LOG),
+                     '291141')
+    # pylint: disable=W0212
+    self.assertEqual(slave_utils._GetGitCommitPositionFromLog(BLINK_LOG),
+                     '180728')
+
+  def test_GetCommitPosFromBuildPropTest(self):
+    """Tests related to getting a commit position from build properties."""
+    # pylint: disable=W0212
+    self.assertEqual(slave_utils._GetCommitPos(
+        {'got_revision_cp': 'refs/heads/master@{#12345}'}), 12345)
+    # pylint: disable=W0212
+    self.assertIsNone(slave_utils._GetCommitPos({'got_revision': 12345}))
+
+class TelemetryRevisionTest(unittest.TestCase):
+  def test_GetTelemetryRevisions(self):
+    point_id = 1470050195
+    revision = '294850'
+    webkit_revision = '34f9d01'
+    build_properties = {
+      'got_webrtc_revision': None,
+      'got_v8_revision': 'undefined',
+      'git_revision': '9a7b354',
+    }
+    versions = slave_utils.GetTelemetryRevisions(
+        build_properties, revision,  webkit_revision, point_id)
+    self.assertEqual(
+        {'rev': '294850', 'webkit_rev': '34f9d01', 'git_revision': '9a7b354',
+         'point_id': 1470050195},
+        versions)
+
+
 if __name__ == '__main__':
   unittest.main()