[pinpoint] Calculate distances between Changes.

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 118 matching lines @@
     self.addCleanup(patcher.stop)
     file_contents = patcher.start()
     def _FileContents(repository_url, git_hash, path):
       del path
       if repository_url != _CHROMIUM_URL:
         return 'deps = {}'
       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

[perezju, 2017/09/19 15:58:05]

I would like to see a test with nesteded DEPS, at least one extra level deeper.

Also lets add a comment describing the layout of commits being used for these
tests (e.g. which ones are rolls, in which order they fall).

Also wondering; it's a pretty rare scenario. But how would this treat a DEPS
rolling backwards? (i.e. reverting a DEPS roll.)

 
   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))
     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):
     change_a = change.Change((commit.Commit('chromium', 0),))
     change_b = change.Change((commit.Commit('chromium', 9),
                               commit.Commit('not_chromium', 'babe852')))
     with self.assertRaises(commit.NonLinearError):
       change.Change.Midpoint(change_a, change_b)
 
   def testSameChange(self):
     change_a = change.Change((commit.Commit('chromium', 0),))
     change_b = change.Change((commit.Commit('chromium', 0),))
-    with self.assertRaises(commit.NonLinearError):
-      change.Change.Midpoint(change_a, change_b)
+    expected = change_a, (0, 0)
+    self.assertEqual(change.Change.Midpoint(change_a, change_b), expected)
 
   def testAdjacentWithNoDepsRoll(self):
     change_a = change.Change((commit.Commit('chromium', 0),))
     change_b = change.Change((commit.Commit('chromium', 1),))
-    with self.assertRaises(commit.NonLinearError):
-      change.Change.Midpoint(change_a, change_b)
+    expected = change_a, (0, 1)
+    self.assertEqual(change.Change.Midpoint(change_a, change_b), expected)
 
   def testAdjacentWithDepsRoll(self):
     change_a = change.Change((commit.Commit('chromium', 4),))
     change_b = change.Change((commit.Commit('chromium', 5),))
     expected = change.Change((commit.Commit('chromium', 4),
-                              commit.Commit('catapult', 4)))
+                              commit.Commit('catapult', 4))), (4, 5)
     self.assertEqual(change.Change.Midpoint(change_a, change_b), expected)
 
   def testNotAdjacent(self):
     change_a = change.Change((commit.Commit('chromium', 0),))
     change_b = change.Change((commit.Commit('chromium', 9),))
-    self.assertEqual(change.Change.Midpoint(change_a, change_b),
-                     change.Change((commit.Commit('chromium', 4),)))
+    expected = change.Change((commit.Commit('chromium', 4),)), (4, 5)
+    self.assertEqual(change.Change.Midpoint(change_a, change_b), expected)
 
   def testDepsRollLeft(self):
     change_a = change.Change((commit.Commit('chromium', 4),))
     change_b = change.Change((commit.Commit('chromium', 4),
                               commit.Commit('catapult', 4)))
     expected = change.Change((commit.Commit('chromium', 4),
-                              commit.Commit('catapult', 2)))
+                              commit.Commit('catapult', 2))), (2, 2)
     self.assertEqual(change.Change.Midpoint(change_a, change_b), expected)
 
   def testDepsRollRight(self):
     change_a = change.Change((commit.Commit('chromium', 4),
                               commit.Commit('catapult', 4)))
     change_b = change.Change((commit.Commit('chromium', 5),))
     expected = change.Change((commit.Commit('chromium', 4),
-                              commit.Commit('catapult', 6)))
+                              commit.Commit('catapult', 6))), (2, 3)
     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)))
+                              commit.Commit('catapult', 2))), (2, 2)
     self.assertEqual(change.Change.Midpoint(change_a, change_b), expected)