Fix gcl breakage.

tests/presubmit_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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 presubmit_support.py and presubmit_canned_checks.py."""
 
 import exceptions
 import StringIO
 import unittest
@@ skipping 38 matching lines @@
     presubmit.os.path.splitext = os_path_splitext
     self.mox.StubOutWithMock(presubmit, 'sys')
     # Special mocks.
     def MockAbsPath(f):
       return f
     presubmit.os.path.abspath = MockAbsPath
     self.fake_root_dir = self.RootDir()
     self.mox.StubOutWithMock(presubmit.gclient, 'CaptureSVNInfo')
     self.mox.StubOutWithMock(presubmit.gcl, 'GetSVNFileProperty')
     self.mox.StubOutWithMock(presubmit.gcl, 'ReadFile')
-    self.mox.StubOutWithMock(presubmit.gcl, 'ChangeInfo')
-
-  def MakeChangeInfo(self, name, issue, patchset, description):
-    ci = self.mox.CreateMock(presubmit.gcl.ChangeInfo)
-    ci.name = name
-    ci.issue = issue
-    ci.patchset = patchset
-    ci.description = description
-    ci.patch = None
-    ci.local_root = self.fake_root_dir
+    # Stub any non-getter function in gcl.ChangeInfo.
+    to_skip = lambda x: not x.startswith('_') and not x.startswith('Get')
+    for member in filter(to_skip, dir(presubmit.gcl.ChangeInfo)):
+      self.mox.StubOutWithMock(presubmit.gcl.ChangeInfo, member)
+   
+  def MakeChangeInfo(self, name, issue, patchset, description, files):
+    ci = presubmit.gcl.ChangeInfo(name, issue, patchset, description, files,
+                                  self.fake_root_dir)
     return ci
 
 
 class PresubmitUnittest(PresubmitTestsBase):
   """General presubmit_support.py tests (excluding InputApi and OutputApi)."""
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
       'AffectedFile', 'DoPresubmitChecks', 'GclChange', 'InputApi',
       'ListRelevantPresubmitFiles', 'Main', 'NotImplementedException',
@@ skipping 86 matching lines @@
         notfound, 'svn:mime-type').AndReturn('')
     presubmit.gclient.CaptureSVNInfo(blat).AndReturn(
             {'URL': 'svn:/foo/foo/blat.cc'})
     presubmit.gclient.CaptureSVNInfo(binary).AndReturn(
         {'URL': 'svn:/foo/binary.dll'})
     presubmit.gclient.CaptureSVNInfo(notfound).AndReturn({})
     presubmit.gclient.CaptureSVNInfo(flap).AndReturn(
             {'URL': 'svn:/foo/boo/flap.h'})
     presubmit.gcl.ReadFile(blat).AndReturn('boo!\nahh?')
     presubmit.gcl.ReadFile(notfound).AndReturn('look!\nthere?')
-    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines))
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn(files)
+    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines),
+                             files)
     self.mox.ReplayAll()
 
     change = presubmit.GclChange(ci)
 
     self.failUnless(change.Name() == 'mychange')
     self.failUnless(change.DescriptionText() ==
                     'Hello there\nthis is a change\nand some more regular text')
     self.failUnless(change.FullDescriptionText() ==
                     '\n'.join(description_lines))
 
@@ skipping 45 matching lines @@
     self.assertEquals(rhs_lines[3][2], 'there?')
 
   def testExecPresubmitScript(self):
     description_lines = ('Hello there',
                          'this is a change',
                          'STORY=http://tracker/123')
     files = [
       ['A', 'foo\\blat.cc'],
     ]
     fake_presubmit = presubmit.os.path.join(self.fake_root_dir, 'PRESUBMIT.py')
-    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines))
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn(files)
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn(files)
+    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines),
+                             files)
     self.mox.ReplayAll()
 
     executer = presubmit.PresubmitExecuter(ci, False)
     self.failIf(executer.ExecPresubmitScript('', fake_presubmit))
     # No error if no on-upload entry point
     self.failIf(executer.ExecPresubmitScript(
       ('def CheckChangeOnCommit(input_api, output_api):\n'
        '  return (output_api.PresubmitError("!!"))\n'),
       fake_presubmit
     ))
@@ skipping 45 matching lines @@
       ['A', join('haspresubmit', 'blat.cc')],
     ]
     haspresubmit_path = join(self.fake_root_dir, 'haspresubmit', 'PRESUBMIT.py')
     root_path = join(self.fake_root_dir, 'PRESUBMIT.py')
     presubmit.os.path.isfile(root_path).AndReturn(True)
     presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
     presubmit.gcl.ReadFile(root_path,
                            'rU').AndReturn(self.presubmit_text)
     presubmit.gcl.ReadFile(haspresubmit_path,
                            'rU').AndReturn(self.presubmit_text)
-    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines))
-    ci.GetFileNames().AndReturn([item[1] for item in files])
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn(files)
+    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines),
+                             files)
     self.mox.ReplayAll()
 
     output = StringIO.StringIO()
     input = StringIO.StringIO('y\n')
 
     self.failIf(presubmit.DoPresubmitChecks(ci, False, True, output, input,
                                             None, False))
     self.assertEqual(output.getvalue().count('!!'), 2)
 
   def testDoPresubmitChecksPromptsAfterWarnings(self):
     join = presubmit.os.path.join
     description_lines = ('Hello there',
                          'this is a change',
                          'NOSUCHKEY=http://tracker/123')
     files = [
       ['A', join('haspresubmit', 'blat.cc')],
     ]
     presubmit_path = join(self.fake_root_dir, 'PRESUBMIT.py')
     haspresubmit_path = join(self.fake_root_dir, 'haspresubmit', 'PRESUBMIT.py')
-    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines))
+    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines),
+                             files)
     for i in range(2):
       presubmit.os.path.isfile(presubmit_path).AndReturn(True)
       presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
       presubmit.gcl.ReadFile(presubmit_path, 'rU'
           ).AndReturn(self.presubmit_text)
       presubmit.gcl.ReadFile(haspresubmit_path, 'rU'
           ).AndReturn(self.presubmit_text)
-      ci.GetFileNames().AndReturn([item[1] for item in files])
-      ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-      ci.GetFiles().AndReturn(files)
     self.mox.ReplayAll()
 
     output = StringIO.StringIO()
     input = StringIO.StringIO('n\n')  # say no to the warning
     self.failIf(presubmit.DoPresubmitChecks(ci, False, True, output, input,
                                             None, True))
     self.assertEqual(output.getvalue().count('??'), 2)
 
     output = StringIO.StringIO()
     input = StringIO.StringIO('y\n')  # say yes to the warning
@@ skipping 11 matching lines @@
       ['A', join('haspresubmit', 'blat.cc')],
     ]
     presubmit_path = join(self.fake_root_dir, 'PRESUBMIT.py')
     haspresubmit_path = join(self.fake_root_dir, 'haspresubmit',
                              'PRESUBMIT.py')
     presubmit.os.path.isfile(presubmit_path).AndReturn(True)
     presubmit.os.path.isfile(haspresubmit_path).AndReturn(True)
     presubmit.gcl.ReadFile(presubmit_path, 'rU').AndReturn(self.presubmit_text)
     presubmit.gcl.ReadFile(haspresubmit_path, 'rU').AndReturn(
         self.presubmit_text)
-    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines))
-    ci.GetFileNames().AndReturn([item[1] for item in files])
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn(files)
+    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines),
+                             files)
     self.mox.ReplayAll()
 
     output = StringIO.StringIO()
     input = StringIO.StringIO()  # should be unused
     self.failIf(presubmit.DoPresubmitChecks(ci, False, True, output, input,
                                             None, False))
     self.assertEqual(output.getvalue().count('??'), 2)
     self.assertEqual(output.getvalue().count('XX!!XX'), 2)
     self.assertEqual(output.getvalue().count('(y/N)'), 0)
 
   def testDoDefaultPresubmitChecks(self):
     join = presubmit.os.path.join
     description_lines = ('Hello there',
                          'this is a change',
                          'STORY=http://tracker/123')
     files = [
       ['A', join('haspresubmit', 'blat.cc')],
     ]
     DEFAULT_SCRIPT = """
 def CheckChangeOnUpload(input_api, output_api):
   return [output_api.PresubmitError("!!")]
 def CheckChangeOnCommit(input_api, output_api):
   raise Exception("Test error")
 """
     presubmit.os.path.isfile(join(self.fake_root_dir, 'PRESUBMIT.py')
         ).AndReturn(False)
     presubmit.os.path.isfile(join(self.fake_root_dir,
                                   'haspresubmit',
                                   'PRESUBMIT.py')).AndReturn(False)
-    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines))
-    ci.GetFileNames().AndReturn([item[1] for item in files])
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn(files)
+    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines),
+                             files)
     self.mox.ReplayAll()
     
     output = StringIO.StringIO()
     input = StringIO.StringIO('y\n')
     # Always fail.
     self.failIf(presubmit.DoPresubmitChecks(ci, False, True, output, input,
                                             DEFAULT_SCRIPT, False))
     self.assertEquals(output.getvalue().count('!!'), 1)
 
   def testDirectoryHandling(self):
     files = [
       ['A', 'isdir'],
       ['A', 'isdir\\blat.cc'],
     ]
     isdir = presubmit.os.path.join(self.fake_root_dir, 'isdir')
     blat = presubmit.os.path.join(isdir, 'blat.cc')
     presubmit.os.path.exists(isdir).AndReturn(True)
     presubmit.os.path.isdir(isdir).AndReturn(True)
     presubmit.os.path.exists(blat).AndReturn(True)
     presubmit.os.path.isdir(blat).AndReturn(False)
-    ci = self.MakeChangeInfo('mychange', 0, 0, 'foo')
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn(files)
+    ci = self.MakeChangeInfo('mychange', 0, 0, 'foo', files)
     self.mox.ReplayAll()
 
     change = presubmit.GclChange(ci)
     affected_files = change.AffectedFiles(include_dirs=False)
     self.failUnless(len(affected_files) == 1)
     self.failUnless(affected_files[0].LocalPath().endswith('blat.cc'))
     affected_files_and_dirs = change.AffectedFiles(include_dirs=True)
     self.failUnless(len(affected_files_and_dirs) == 2)
 
   def testTags(self):
@@ skipping 21 matching lines @@
                                       input_api.change.DescriptionText())]
   if (input_api.change.FullDescriptionText() !=
       'Blah Blah\\n\\nSTORY=http://tracker.com/42\\nBUG=boo\\n'):
     return [output_api.PresubmitError('Tag parsing failed. 5 ' +
                                       input_api.change.FullDescriptionText())]
   return [output_api.PresubmitNotifyResult(input_api.change.tags['STORY'])]
 def CheckChangeOnCommit(input_api, output_api):
   raise Exception("Test error")
 """
     ci = self.MakeChangeInfo(
-        'foo', 0, 0, "Blah Blah\n\nSTORY=http://tracker.com/42\nBUG=boo\n")
-    ci.GetFileNames().AndReturn([])
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn([])
+        'foo', 0, 0, "Blah Blah\n\nSTORY=http://tracker.com/42\nBUG=boo\n",
+        None)
     self.mox.ReplayAll()
 
     output = StringIO.StringIO()
     input = StringIO.StringIO('y\n')
     self.failUnless(presubmit.DoPresubmitChecks(ci, False, True, output,
                                                 input, DEFAULT_SCRIPT, False))
     self.assertEquals(output.getvalue(),
                       ('Warning, no presubmit.py found.\n'
                        'Running default presubmit script.\n'
                        '** Presubmit Messages **\n'
@@ skipping 90 matching lines @@
     presubmit.gcl.GetSVNFileProperty(blat, 'svn:mime-type').AndReturn(None)
     presubmit.gcl.GetSVNFileProperty(readme, 'svn:mime-type').AndReturn(None)
     presubmit.gcl.GetSVNFileProperty(binary, 'svn:mime-type').AndReturn(
         'application/octet-stream')
     presubmit.gcl.GetSVNFileProperty(weird, 'svn:mime-type').AndReturn(None)
     presubmit.gcl.GetSVNFileProperty(another, 'svn:mime-type').AndReturn(None)
     presubmit.gcl.GetSVNFileProperty(third_party, 'svn:mime-type'
         ).AndReturn(None)
     presubmit.gcl.ReadFile(blat).AndReturn('whatever\ncookie')
     presubmit.gcl.ReadFile(another).AndReturn('whatever\ncookie2')
-    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines))
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn(files)
+    ci = self.MakeChangeInfo('mychange', 0, 0, '\n'.join(description_lines),
+                             files)
     self.mox.ReplayAll()
 
     change = presubmit.GclChange(ci)
     input_api = presubmit.InputApi(change,
                                    join(self.fake_root_dir, 'foo',
                                         'PRESUBMIT.py'),
                                    False)
     # Doesn't filter much
     got_files = input_api.AffectedFiles()
     self.assertEquals(len(got_files), 7)
@@ skipping 91 matching lines @@
 
   def testCustomFilter(self):
     def FilterSourceFile(affected_file):
       return 'a' in affected_file.LocalPath()
     files = [('A', 'eeaee'), ('M', 'eeabee'), ('M', 'eebcee')]
     for (action, item) in files:
       item = presubmit.os.path.join(self.fake_root_dir, item)
       presubmit.os.path.exists(item).AndReturn(True)
       presubmit.os.path.isdir(item).AndReturn(False)
       presubmit.gcl.GetSVNFileProperty(item, 'svn:mime-type').AndReturn(None)
-    ci = self.MakeChangeInfo('mychange', 0, 0, '')
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn(files)
+    ci = self.MakeChangeInfo('mychange', 0, 0, '', files)
     self.mox.ReplayAll()
 
     change = presubmit.GclChange(ci)
     input_api = presubmit.InputApi(change,
                                    presubmit.os.path.join(self.fake_root_dir,
                                                           'PRESUBMIT.py'),
                                    False)
     got_files = input_api.AffectedSourceFiles(FilterSourceFile)
     self.assertEquals(len(got_files), 2)
     self.assertEquals(got_files[0].LocalPath(), 'eeaee')
     self.assertEquals(got_files[1].LocalPath(), 'eeabee')
 
   def testLambdaFilter(self):
     white_list = presubmit.InputApi.DEFAULT_BLACK_LIST + (r".*?a.*?",)
     black_list = [r".*?b.*?"]
     files = [('A', 'eeaee'), ('M', 'eeabee'), ('M', 'eebcee'), ('M', 'eecaee')]
     for (action, item) in files:
       item = presubmit.os.path.join(self.fake_root_dir, item)
       presubmit.os.path.exists(item).AndReturn(True)
       presubmit.os.path.isdir(item).AndReturn(False)
       presubmit.gcl.GetSVNFileProperty(item, 'svn:mime-type').AndReturn(None)
-    ci = self.MakeChangeInfo('mychange', 0, 0, '')
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn(files)
+    ci = self.MakeChangeInfo('mychange', 0, 0, '', files)
     self.mox.ReplayAll()
 
     change = presubmit.GclChange(ci)
     input_api = presubmit.InputApi(change, './PRESUBMIT.py', False)
     # Sample usage of overiding the default white and black lists.
     got_files = input_api.AffectedSourceFiles(
         lambda x: input_api.FilterSourceFile(x, white_list, black_list))
     self.assertEquals(len(got_files), 2)
     self.assertEquals(got_files[0].LocalPath(), 'eeaee')
     self.assertEquals(got_files[1].LocalPath(), 'eecaee')
 
   def testGetAbsoluteLocalPath(self):
     join = presubmit.os.path.join
     normpath = presubmit.normpath
     # Regression test for bug of presubmit stuff that relies on invoking
     # SVN (e.g. to get mime type of file) not working unless gcl invoked
     # from the client root (e.g. if you were at 'src' and did 'cd base' before
     # invoking 'gcl upload' it would fail because svn wouldn't find the files
     # the presubmit script was asking about).
     files = [
       ['A', 'isdir'],
       ['A', join('isdir', 'blat.cc')],
       ['M', join('elsewhere', 'ouf.cc')],
     ]
-    ci = self.MakeChangeInfo('mychange', 0, 0, '')
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn(files)
+    ci = self.MakeChangeInfo('mychange', 0, 0, '', files)
     self.mox.ReplayAll()
 
     # It doesn't make sense on non-Windows platform. This is somewhat hacky,
     # but it is needed since we can't just use os.path.join('c:', 'temp').
     change = presubmit.GclChange(ci)
     affected_files = change.AffectedFiles(include_dirs=True)
     # Local paths should remain the same
     self.assertEquals(affected_files[0].LocalPath(), normpath('isdir'))
     self.assertEquals(affected_files[1].LocalPath(), normpath('isdir/blat.cc'))
     # Absolute paths should be prefixed
@@ skipping 13 matching lines @@
     self.assertEqual(len(paths_from_api), 2)
     for absolute_paths in [paths_from_change, paths_from_api]:
       self.assertEqual(absolute_paths[0],
                        normpath(join(self.fake_root_dir, 'isdir')))
       self.assertEqual(absolute_paths[1],
                        normpath(join(self.fake_root_dir, 'isdir', 'blat.cc')))
 
   def testDeprecated(self):
     presubmit.warnings.warn(mox.IgnoreArg(), category=mox.IgnoreArg(),
                             stacklevel=2)
-    ci = self.MakeChangeInfo('mychange', 0, 0, 'Bleh\n')
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn([])
+    ci = self.MakeChangeInfo('mychange', 0, 0, 'Bleh\n', [])
     self.mox.ReplayAll()
 
     change = presubmit.GclChange(ci)
     api = presubmit.InputApi(
         change,
         presubmit.os.path.join(self.fake_root_dir, 'foo', 'PRESUBMIT.py'), True)
     api.AffectedTextFiles(include_deletes=False)
 
   def testReadFileStringDenied(self):
-    ci = self.MakeChangeInfo('foo', 0, 0, 'Foo\n')
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn([('M', 'AA')])
+    ci = self.MakeChangeInfo('foo', 0, 0, 'Foo\n', [('M', 'AA')])
     self.mox.ReplayAll()
 
     input_api = presubmit.InputApi(
         None, presubmit.os.path.join(self.fake_root_dir, '/p'), False)
     input_api.change = presubmit.GclChange(ci)
     self.assertRaises(IOError, input_api.ReadFile, 'boo', 'x')
 
   def testReadFileStringAccepted(self):
-    ci = self.MakeChangeInfo('foo', 0, 0, 'Foo\n')
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
+    ci = self.MakeChangeInfo('foo', 0, 0, 'Foo\n', [('M', 'AA')])
     path = presubmit.os.path.join(self.fake_root_dir, 'AA/boo')
-    ci.GetFiles().AndReturn([('M', 'AA')])
     presubmit.gcl.ReadFile(path, 'x').AndReturn(None)
     self.mox.ReplayAll()
 
     input_api = presubmit.InputApi(
         None, presubmit.os.path.join(self.fake_root_dir, '/p'), False)
     input_api.change = presubmit.GclChange(ci)
     input_api.ReadFile(path, 'x')
 
   def testReadFileAffectedFileDenied(self):
-    ci = self.MakeChangeInfo('foo', 0, 0, 'Foo\n')
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn([('M', 'AA')])
+    ci = self.MakeChangeInfo('foo', 0, 0, 'Foo\n', [('M', 'AA')])
     file = presubmit.AffectedFile('boo', 'M', 'Unrelated')
     self.mox.ReplayAll()
 
     input_api = presubmit.InputApi(
         None, presubmit.os.path.join(self.fake_root_dir, '/p'), False)
     input_api.change = presubmit.GclChange(ci)
     self.assertRaises(IOError, input_api.ReadFile, file, 'x')
 
   def testReadFileAffectedFileAccepted(self):
-    ci = self.MakeChangeInfo('foo', 0, 0, 'Foo\n')
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn([('M', 'AA')])
+    ci = self.MakeChangeInfo('foo', 0, 0, 'Foo\n', [('M', 'AA')])
     file = presubmit.AffectedFile('AA/boo', 'M', self.fake_root_dir)
     presubmit.gcl.ReadFile(file.AbsoluteLocalPath(), 'x').AndReturn(None)
     self.mox.ReplayAll()
 
     input_api = presubmit.InputApi(
         None, presubmit.os.path.join(self.fake_root_dir, '/p'), False)
     input_api.change = presubmit.GclChange(ci)
     input_api.ReadFile(file, 'x')
 
 
@@ skipping 133 matching lines @@
 
 class GclChangeUnittest(PresubmitTestsBase):
   def testMembersChanged(self):
     members = [
         'AbsoluteLocalPaths', 'AffectedFiles', 'AffectedTextFiles',
         'DescriptionText', 'FullDescriptionText', 'LocalPaths', 'Name',
         'RepositoryRoot', 'RightHandSideLines', 'ServerPaths',
         'issue', 'patchset', 'tags',
     ]
     # If this test fails, you should add the relevant test.
-    ci = self.MakeChangeInfo('', 0, 0, '')
-    ci.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci.GetFiles().AndReturn([])
+    ci = self.MakeChangeInfo('', 0, 0, '', [])
     self.mox.ReplayAll()
 
     self.compareMembers(presubmit.GclChange(ci), members)
 
 
 class CannedChecksUnittest(PresubmitTestsBase):
   """Tests presubmit_canned_checks.py."""
 
   def setUp(self):
     PresubmitTestsBase.setUp(self)
@@ skipping 22 matching lines @@
       'CheckDoNotSubmitInDescription', 'CheckDoNotSubmitInFiles',
       'CheckLongLines', 'CheckTreeIsOpen', 'RunPythonUnitTests',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(presubmit_canned_checks, members)
 
   def DescriptionTest(self, check, description1, description2, error_type,
                       committing):
     input_api1 = self.MockInputApi()
     input_api1.is_committing = committing
-    ci1 = self.MakeChangeInfo('foo', 0, 0, description1)
-    ci1.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci1.GetFiles().AndReturn([])
+    ci1 = self.MakeChangeInfo('foo', 0, 0, description1, [])
     input_api2 = self.MockInputApi()
     input_api2.is_committing = committing
-    ci2 = self.MakeChangeInfo('foo', 0, 0, description2)
-    ci2.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci2.GetFiles().AndReturn([])
+    ci2 = self.MakeChangeInfo('foo', 0, 0, description2, [])
     self.mox.ReplayAll()
 
     input_api1.change = presubmit.GclChange(ci1)
     input_api2.change = presubmit.GclChange(ci2)
     results1 = check(input_api1, presubmit.OutputApi)
     self.assertEquals(results1, [])
     results2 = check(input_api2, presubmit.OutputApi)
     self.assertEquals(len(results2), 1)
     self.assertEquals(results2[0].__class__, error_type)
 
   def ContentTest(self, check, content1, content2, error_type):
     input_api1 = self.MockInputApi()
-    ci1 = self.MakeChangeInfo('foo', 0, 0, 'foo1\n')
-    ci1.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci1.GetFiles().AndReturn([])
+    ci1 = self.MakeChangeInfo('foo', 0, 0, 'foo1\n', [])
     affected_file = self.mox.CreateMock(presubmit.SvnAffectedFile)
     affected_file.LocalPath().AndReturn('foo.cc')
     output1 = [
       (affected_file, 42, 'yo, ' + content1),
       (affected_file, 43, 'yer'),
       (affected_file, 23, 'ya'),
     ]
     input_api1.RightHandSideLines(mox.IgnoreArg()).AndReturn(output1)
     input_api2 = self.MockInputApi()
-    ci2 = self.MakeChangeInfo('foo2', 0, 0, 'foo2\n')
-    ci2.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci2.GetFiles().AndReturn([])
+    ci2 = self.MakeChangeInfo('foo2', 0, 0, 'foo2\n', None)
     output2 = [
       (affected_file, 42, 'yo, ' + content2),
       (affected_file, 43, 'yer'),
       (affected_file, 23, 'ya'),
     ]
     input_api2.RightHandSideLines(mox.IgnoreArg()).AndReturn(output2)
     self.mox.ReplayAll()
 
     input_api1.change = presubmit.GclChange(ci1)
     input_api2.change = presubmit.GclChange(ci2)
     results1 = check(input_api1, presubmit.OutputApi, None)
     self.assertEquals(results1, [])
     results2 = check(input_api2, presubmit.OutputApi, None)
     self.assertEquals(len(results2), 1)
     self.assertEquals(results2[0].__class__, error_type)
 
   def ReadFileTest(self, check, content1, content2, error_type):
     input_api1 = self.MockInputApi()
     self.mox.StubOutWithMock(input_api1, 'ReadFile')
-    ci1 = self.MakeChangeInfo('foo', 0, 0, 'foo1\n')
-    ci1.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci1.GetFiles().AndReturn([])
+    ci1 = self.MakeChangeInfo('foo', 0, 0, 'foo1\n', None)
     affected_file1 = self.mox.CreateMock(presubmit.SvnAffectedFile)
     input_api1.AffectedSourceFiles(None).AndReturn([affected_file1])
     input_api1.ReadFile(affected_file1, 'rb').AndReturn(content1)
     input_api2 = self.MockInputApi()
     self.mox.StubOutWithMock(input_api2, 'ReadFile')
-    ci2 = self.MakeChangeInfo('foo2', 0, 0, 'foo2\n')
-    ci2.GetLocalRoot().AndReturn(self.fake_root_dir)
-    ci2.GetFiles().AndReturn([])
+    ci2 = self.MakeChangeInfo('foo2', 0, 0, 'foo2\n', [])
     affected_file2 = self.mox.CreateMock(presubmit.SvnAffectedFile)
     input_api2.AffectedSourceFiles(None).AndReturn([affected_file2])
     input_api2.ReadFile(affected_file2, 'rb').AndReturn(content2)
     affected_file2.LocalPath().AndReturn('bar.cc')
     self.mox.ReplayAll()
 
     input_api1.change = presubmit.GclChange(ci1)
     input_api2.change = presubmit.GclChange(ci2)
     results = check(input_api1, presubmit.OutputApi)
     self.assertEquals(results, [])
@@ skipping 293 matching lines @@
     test_result.errors = 0
     self.mox.ReplayAll()
 
     results = presubmit_canned_checks.RunPythonUnitTests(
         input_api, presubmit.OutputApi, ['test_module'])
     self.assertEquals(len(results), 0)
 
 
 if __name__ == '__main__':
   unittest.main()