[pinpoint] Gerrit patch support.

dashboard/dashboard/pinpoint/models/change/change_test.py

 # Copyright 2016 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 mock
 
 from dashboard.common import namespaced_stored_object
 from dashboard.common import testing_common
 from dashboard.pinpoint.models.change import change
 from dashboard.pinpoint.models.change import commit
@@ skipping 20 matching lines @@
         _CATAPULT_URL: 'catapult',
         _CHROMIUM_URL: 'chromium',
     })
 
 
 class ChangeTest(_ChangeTest):
 
   def testChange(self):
     base_commit = commit.Commit('chromium', 'aaa7336c821888839f759c6c0a36b56c')
     dep = commit.Commit('catapult', 'e0a2efbb3d1a81aac3c90041eefec24f066d26ba')
-    p = patch.Patch('https://codereview.chromium.org', 2565263002, 20001)
+    p = patch.GerritPatch('https://codereview.com', 672011, '2f0d5c7')
 
     # Also test the deps conversion to frozenset.
     c = change.Change([base_commit, dep], p)
 
     self.assertEqual(c, change.Change((base_commit, dep), p))
     string = ('chromium@aaa7336 catapult@e0a2efb + '
-              'https://codereview.chromium.org/2565263002/20001')
+              'https://codereview.com/672011/2f0d5c7')
     id_string = ('catapult@e0a2efbb3d1a81aac3c90041eefec24f066d26ba '
                  'chromium@aaa7336c821888839f759c6c0a36b56c + '
-                 'https://codereview.chromium.org/2565263002/20001')
+                 'https://codereview.com/672011/2f0d5c7')
     self.assertEqual(str(c), string)
     self.assertEqual(c.id_string, id_string)
     self.assertEqual(c.base_commit, base_commit)
     self.assertEqual(c.last_commit, dep)
     self.assertEqual(c.deps, (dep,))
     self.assertEqual(c.commits, (base_commit, dep))
     self.assertEqual(c.patch, p)
 
   def testAsDict(self):
     commits = (commit.Commit('chromium', 'aaa7336c82'),
                commit.Commit('catapult', 'e0a2efbb3d'))
-    p = patch.Patch('https://codereview.chromium.org', 2565263002, 20001)
+    p = patch.GerritPatch('https://codereview.com', 672011, '2f0d5c7')
     c = change.Change(commits, p)
 
     expected = {
         'commits': [
             {
                 'repository': 'chromium',
                 'git_hash': 'aaa7336c82',
                 'url': _CHROMIUM_URL + '/+/aaa7336c82',
             },
             {
                 'repository': 'catapult',
                 'git_hash': 'e0a2efbb3d',
                 'url': _CATAPULT_URL + '/+/e0a2efbb3d',
             },
         ],
         'patch': {
-            'server': 'https://codereview.chromium.org',
-            'issue': 2565263002,
-            'patchset': 20001,
+            'server': 'https://codereview.com',
+            'change': 672011,
+            'revision': '2f0d5c7',
         },
     }
     self.assertEqual(c.AsDict(), expected)
 
   @mock.patch('dashboard.services.gitiles_service.CommitInfo')
   def testFromDictWithJustOneCommit(self, _):
     c = change.Change.FromDict({
         'commits': [{'repository': 'chromium', 'git_hash': 'aaa7336'}],
     })
 
     expected = change.Change((commit.Commit('chromium', 'aaa7336'),))
     self.assertEqual(c, expected)
 
+  @mock.patch('dashboard.services.gerrit_service.GetChange')
   @mock.patch('dashboard.services.gitiles_service.CommitInfo')
-  def testFromDictWithAllFields(self, _):
+  def testFromDictWithAllFields(self, _, get_change):
+    get_change.return_value = {
+        'id': 'repo~branch~id',
+        'revisions': {'2f0d5c7': {}}
+    }
+
     c = change.Change.FromDict({
         'commits': (
             {'repository': 'chromium', 'git_hash': 'aaa7336'},
             {'repository': 'catapult', 'git_hash': 'e0a2efb'},
         ),
         'patch': {
-            'server': 'https://codereview.chromium.org',
-            'issue': 2565263002,
-            'patchset': 20001,
+            'server': 'https://codereview.com',
+            'change': 672011,
+            'revision': '2f0d5c7',
         },
     })
 
     commits = (commit.Commit('chromium', 'aaa7336'),
                commit.Commit('catapult', 'e0a2efb'))
-    p = patch.Patch('https://codereview.chromium.org', 2565263002, 20001)
+    p = patch.GerritPatch('https://codereview.com', 'repo~branch~id', '2f0d5c7')
     expected = change.Change(commits, p)
     self.assertEqual(c, expected)
 
 
 class MidpointTest(_ChangeTest):
 
   def setUp(self):
     super(MidpointTest, self).setUp()
 
     patcher = mock.patch('dashboard.services.gitiles_service.CommitRange')
@@ skipping 16 matching lines @@
       if git_hash <= 4:  # DEPS roll at chromium@5
         return 'deps = {"chromium/catapult": "%s@0"}' % (_CATAPULT_URL + '.git')
       else:
         return 'deps = {"chromium/catapult": "%s@9"}' % _CATAPULT_URL
     file_contents.side_effect = _FileContents
 
   def testDifferingPatch(self):
     change_a = change.Change((commit.Commit('chromium', '0e57e2b'),))
     change_b = change.Change(
         (commit.Commit('chromium', 'babe852'),),
-        patch=patch.Patch('https://codereview.chromium.org', 2565263002, 20001))
+        patch=patch.GerritPatch('https://codereview.com', 672011, '2f0d5c7'))
     with self.assertRaises(commit.NonLinearError):
       change.Change.Midpoint(change_a, change_b)
 
   def testDifferingRepository(self):
     change_a = change.Change((commit.Commit('chromium', '0e57e2b'),))
     change_b = change.Change((commit.Commit('not_chromium', 'babe852'),))
     with self.assertRaises(commit.NonLinearError):
       change.Change.Midpoint(change_a, change_b)
 
   def testDifferingCommitCount(self):
@@ skipping 44 matching lines @@
                               commit.Commit('catapult', 6)))
     self.assertEqual(change.Change.Midpoint(change_a, change_b), expected)
 
   def testAdjacentWithDepsRollAndDepAlreadyOverridden(self):
     change_a = change.Change((commit.Commit('chromium', 4),))
     change_b = change.Change((commit.Commit('chromium', 5),
                               commit.Commit('catapult', 4)))
     expected = change.Change((commit.Commit('chromium', 4),
                               commit.Commit('catapult', 2)))
     self.assertEqual(change.Change.Midpoint(change_a, change_b), expected)