Autoroller: Support for rolling individual DEPS entries.

tools/autoroller/unittests/roll_chromium_revision_test.py

Index: tools/autoroller/unittests/roll_chromium_revision_test.py
diff --git a/tools/autoroller/unittests/roll_chromium_revision_test.py b/tools/autoroller/unittests/roll_chromium_revision_test.py
index 7c899e92a990b8c4fd52f1bade0eab32756f60fe..d7b3e26bde5af36022f46f77f8e1ded3e5080076 100755
--- a/tools/autoroller/unittests/roll_chromium_revision_test.py
+++ b/tools/autoroller/unittests/roll_chromium_revision_test.py
@@ -7,6 +7,7 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
+import glob
 import os
 import shutil
 import sys
@@ -17,8 +18,11 @@ import unittest
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 PARENT_DIR = os.path.join(SCRIPT_DIR, os.pardir)
 sys.path.append(PARENT_DIR)
-from roll_chromium_revision import ParseDepsDict, UpdateDeps, \
-    GetMatchingDepsEntries
+import roll_chromium_revision
+from roll_chromium_revision import CalculateChangedDepsProper, \
+  GetMatchingDepsEntries, ParseDepsDict, \
+  ParseLocalDepsFile, UpdateDepsFile
+
 
 TEST_DATA_VARS = {
   'chromium_git': 'https://chromium.googlesource.com',
@@ -32,28 +36,65 @@ DEPS_ENTRIES = {
   'src/testing/gmock': 'https://gmock.com',
 }
 
+BUILD_OLD_REV = '52f7afeca991d96d68cf0507e20dbdd5b845691f'
+BUILD_NEW_REV = 'HEAD'
+BUILDTOOLS_OLD_REV = '64e38f0cebdde27aa0cfb405f330063582f9ac76'
+BUILDTOOLS_NEW_REV = '55ad626b08ef971fd82a62b7abb325359542952b'
+
+
+class TestError(Exception):
+  pass
+
+
+class FakeCmd(object):
+  def __init__(self):
+    self.expectations = []
+
+  def add_expectation(self, *args, **kwargs):
+    returns = kwargs.pop('_returns', None)
+    self.expectations.append((args, kwargs, returns))
+
+  def __call__(self, *args, **kwargs):
+    if not self.expectations:
+      raise TestError('Got unexpected\n%s\n%s' % (args, kwargs))
+    exp_args, exp_kwargs, exp_returns = self.expectations.pop(0)
+    if args != exp_args or kwargs != exp_kwargs:
+      message = 'Expected:\n  args: %s\n  kwargs: %s\n' % (exp_args, exp_kwargs)
+      message += 'Got:\n  args: %s\n  kwargs: %s\n' % (args, kwargs)
+      raise TestError(message)
+    return exp_returns
+
 
 class TestRollChromiumRevision(unittest.TestCase):
   def setUp(self):
     self._output_dir = tempfile.mkdtemp()
-    shutil.copy(os.path.join(SCRIPT_DIR, 'DEPS'), self._output_dir)
-    self._deps_filename = os.path.join(self._output_dir, 'DEPS')
+    for test_file in glob.glob(os.path.join(SCRIPT_DIR, 'testdata', '*')):
+      shutil.copy(test_file, self._output_dir)
+    self._webrtc_depsfile = os.path.join(self._output_dir, 'DEPS')
+    self._old_cr_depsfile = os.path.join(self._output_dir, 'DEPS.chromium.old')
+    self._new_cr_depsfile = os.path.join(self._output_dir, 'DEPS.chromium.new')
+
+    self.fake = FakeCmd()
+    self.old_RunCommand = getattr(roll_chromium_revision, '_RunCommand')
+    setattr(roll_chromium_revision, '_RunCommand', self.fake)
 
   def tearDown(self):
     shutil.rmtree(self._output_dir, ignore_errors=True)
+    self.assertEqual(self.fake.expectations, [])
+    setattr(roll_chromium_revision, '_RunCommand', self.old_RunCommand)
 
-  def testUpdateDeps(self):
+  def testUpdateDepsFile(self):
     new_rev = 'aaaaabbbbbcccccdddddeeeeefffff0000011111'
 
     current_rev = TEST_DATA_VARS['chromium_revision']
-    UpdateDeps(self._deps_filename, current_rev, new_rev)
-    with open(self._deps_filename) as deps_file:
+    UpdateDepsFile(self._webrtc_depsfile, current_rev, new_rev, [])
+    with open(self._webrtc_depsfile) as deps_file:
       deps_contents = deps_file.read()
       self.assertTrue(new_rev in deps_contents,
                       'Failed to find %s in\n%s' % (new_rev, deps_contents))
 
   def testParseDepsDict(self):
-    with open(self._deps_filename) as deps_file:
+    with open(self._webrtc_depsfile) as deps_file:
       deps_contents = deps_file.read()
     local_scope = ParseDepsDict(deps_contents)
     vars_dict = local_scope['vars']
@@ -62,6 +103,8 @@ class TestRollChromiumRevision(unittest.TestCase):
       self.assertEquals(vars_dict[variable_name], TEST_DATA_VARS[variable_name])
     assertVar('chromium_git')
     assertVar('chromium_revision')
+    self.assertEquals(len(local_scope['deps']), 3)
+    self.assertEquals(len(local_scope['deps_os']), 1)
 
   def testGetMatchingDepsEntriesReturnsPathInSimpleCase(self):
     entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/testing/gtest')
@@ -77,5 +120,35 @@ class TestRollChromiumRevision(unittest.TestCase):
     self.assertEquals(len(entries), 1)
     self.assertEquals(entries[0], DEPS_ENTRIES['src/build'])
 
+  def testCalculateChangedDepsProper(self):
+    _SetupGitLsRemoteCall(self.fake,
+        'https://chromium.googlesource.com/chromium/src/build', BUILD_NEW_REV)
+    webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile)
+    new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile)
+    changed_deps = CalculateChangedDepsProper(webrtc_deps, new_cr_deps)
+    self.assertEquals(len(changed_deps), 2)
+    self.assertEquals(changed_deps[0].path, 'src/build')
+    self.assertEquals(changed_deps[0].current_rev, BUILD_OLD_REV)
+    self.assertEquals(changed_deps[0].new_rev, BUILD_NEW_REV)
+
+    self.assertEquals(changed_deps[1].path, 'src/buildtools')
+    self.assertEquals(changed_deps[1].current_rev, BUILDTOOLS_OLD_REV)
+    self.assertEquals(changed_deps[1].new_rev, BUILDTOOLS_NEW_REV)
+
+  def testCalculateChangedDepsLegacy(self):
+    old_cr_deps = ParseLocalDepsFile(self._old_cr_depsfile)
+    new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile)
+    changed_deps = CalculateChangedDepsProper(old_cr_deps, new_cr_deps)
+    self.assertEquals(len(changed_deps), 1)
+    self.assertEquals(changed_deps[0].path, 'src/buildtools')
+    self.assertEquals(changed_deps[0].current_rev, BUILDTOOLS_OLD_REV)
+    self.assertEquals(changed_deps[0].new_rev, BUILDTOOLS_NEW_REV)

[phoglund, 2016/12/13 09:57:02]

Add an explicit test for winsdk and gflags to ensure they're skipped.

[kjellander_webrtc, 2016/12/13 10:25:00]

By checking the number of changed deps, I already verify that they aren't rolled
(in the  testCalculateChangedDepsProper test).

+
+
+def _SetupGitLsRemoteCall(cmd_fake, url, revision):
+  cmd = ['git', 'ls-remote', url, revision]
+  cmd_fake.add_expectation(cmd, _returns=(revision, None))
+
+
 if __name__ == '__main__':
   unittest.main()