Deprecate gcl.GetSVNFileInfo() for gclient.CaptureSVNInfo().

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.py and presubmit_canned_checks.py."""
 
 import os
 import StringIO
 import unittest
 
 # Local imports
 import gcl
+import gclient
 import presubmit
 import presubmit_canned_checks
 
 
 class PresubmitTestsBase(unittest.TestCase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
     self.original_IsFile = os.path.isfile
     def MockIsFile(f):
       dir = os.path.dirname(f)
       return dir.endswith('haspresubmit') or dir == ''
     os.path.isfile = MockIsFile
 
-    self.original_GetSVNFileInfo = gcl.GetSVNFileInfo
-    def MockGetSVNFileInfo(path):
+    self.original_CaptureSVNInfo = gclient.CaptureSVNInfo
+    def MockCaptureSVNInfo(path):
       if path.count('notfound'):
         return {}
       results = {
         'Path': path[len('svn:/foo/'):],
         'URL': 'svn:/foo/%s' % path.replace('\\', '/'),
       }
       if path.endswith('isdir'):
         results['Node Kind'] = 'directory'
       else:
         results['Node Kind'] = 'file'
       return results
-    gcl.GetSVNFileInfo = MockGetSVNFileInfo
+    gclient.CaptureSVNInfo = MockCaptureSVNInfo
 
     self.original_GetSVNFileProperty = gcl.GetSVNFileProperty
     def MockGetSVNFileProperty(path, property_name):
       if property_name == 'svn:secret-property':
         return 'secret-property-value'
       elif path.count('binary'):
         return 'application/octet-stream'
       else:
         if len(path) % 2:
           return 'text/plain'
@@ skipping 23 matching lines @@
         return 'one:%s\r\ntwo:%s' % (path, path)
     gcl.ReadFile = MockReadFile
 
     self.original_GetRepositoryRoot = gcl.GetRepositoryRoot
     def MockGetRepositoryRoot():
       return ''
     gcl.GetRepositoryRoot = MockGetRepositoryRoot
 
   def tearDown(self):
     os.path.isfile = self.original_IsFile
-    gcl.GetSVNFileInfo = self.original_GetSVNFileInfo
+    gclient.CaptureSVNInfo = self.original_CaptureSVNInfo
     gcl.GetSVNFileProperty = self.original_GetSVNFileProperty
     gcl.ReadFile = self.original_ReadFile
     gcl.GetRepositoryRoot = self.original_GetRepositoryRoot
 
   @staticmethod
   def MakeBasicChange(name, description):
     ci = gcl.ChangeInfo(name=name,
                         description=description,
                         files=[])
     change = presubmit.GclChange(ci)
     return change
 
   def compareMembers(self, object, members):
     """If you add a member, be sure to add the relevant test!"""
     # Skip over members starting with '_' since they are usually not meant to
     # be for public use.
     actual_members = [x for x in sorted(dir(object))
                       if not x.startswith('_')]
     self.assertEqual(actual_members, sorted(members))
 
 
 class PresubmitUnittest(PresubmitTestsBase):
   """General presubmit.py tests (excluding InputApi and OutputApi)."""
   def testMembersChanged(self):
     members = [
       'AffectedFile', 'DoPresubmitChecks', 'GclChange', 'InputApi',
       'ListRelevantPresubmitFiles', 'Main', 'NotImplementedException',
       'OutputApi', 'ParseFiles', 'PresubmitExecuter', 'SPECIAL_KEYS',
       'ScanSubDirs', 'cPickle', 'cStringIO', 'exceptions',
-      'fnmatch', 'gcl', 'glob', 'marshal', 'normpath', 'optparse', 'os',
-      'pickle', 'presubmit_canned_checks', 're', 'subprocess', 'sys',
+      'fnmatch', 'gcl', 'gclient', 'glob', 'marshal', 'normpath', 'optparse',
+      'os', 'pickle', 'presubmit_canned_checks', 're', 'subprocess', 'sys',
       'tempfile', 'types', 'urllib2',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(presubmit, members)
 
   def testListRelevantPresubmitFiles(self):
     presubmit_files = presubmit.ListRelevantPresubmitFiles([
         'blat.cc',
         'foo/haspresubmit/yodle/smart.h',
         'moo/mat/gat/yo.h',
@@ skipping 531 matching lines @@
     self.failIf(presubmit_canned_checks.CheckTreeIsOpen(
       self.MockInputApi(), presubmit.OutputApi, url='url_to_open', closed='0'
     ))
     self.failUnless(presubmit_canned_checks.CheckTreeIsOpen(
       self.MockInputApi(), presubmit.OutputApi, url='url_to_closed', closed='0'
     ))
 
 
 if __name__ == '__main__':
   unittest.main()