Get rid of gcl.ReadFile.

tests/gcl_unittest.py

 #!/usr/bin/python
 # Copyright (c) 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 gcl.py."""
 
 # Local imports
 import gcl
 from super_mox import mox, SuperMoxTestBase
 
 
 class GclTestsBase(SuperMoxTestBase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
     SuperMoxTestBase.setUp(self)
     self.fake_root_dir = self.RootDir()
     self.mox.StubOutWithMock(gcl, 'RunShell')
     self.mox.StubOutWithMock(gcl.SVN, 'CaptureInfo')
     self.mox.StubOutWithMock(gcl, 'tempfile')
     self.mox.StubOutWithMock(gcl.upload, 'RealMain')
-    self.mox.StubOutWithMock(gcl, 'ReadFile')
+    self.mox.StubOutWithMock(gcl.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(gcl.gclient_utils, 'FileWrite')
 
 
 class GclUnittest(GclTestsBase):
   """General gcl.py tests."""
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
         'CODEREVIEW_SETTINGS', 'CODEREVIEW_SETTINGS_FILE', 'Change',
         'ChangeInfo', 'Changes', 'Commit', 'DEFAULT_LINT_IGNORE_REGEX',
         'DEFAULT_LINT_REGEX', 'DeleteEmptyChangeLists', 'DoPresubmitChecks',
         'ErrorExit', 'FILES_CACHE', 'FilterFlag', 'GenerateChangeName',
         'GenerateDiff', 'GetCLs', 'GetCacheDir', 'GetCachedFile',
         'GetChangelistInfoFile', 'GetChangesDir', 'GetCodeReviewSetting',
         'GetEditor', 'GetFilesNotInCL', 'GetInfoDir', 'GetIssueDescription',
         'GetModifiedFiles', 'GetRepositoryRoot', 'Help', 'Lint',
         'LoadChangelistInfoForMultiple', 'MISSING_TEST_MSG', 'Opened',
         'OptionallyDoPresubmitChecks', 'PresubmitCL', 'REPOSITORY_ROOT',
-        'ReadFile', 'RunShell', 'RunShellWithReturnCode', 'SVN',
+        'RunShell', 'RunShellWithReturnCode', 'SVN',
         'SendToRietveld', 'TryChange', 'UnknownFiles', 'UploadCL', 'Warn',
         'breakpad', 'gclient_utils', 'getpass', 'main', 'os', 'random', 're',
         'shutil', 'string', 'subprocess', 'sys', 'tempfile', 'upload',
         'urllib2',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gcl, members)
 
   def testIsSVNMoved(self):
     # TODO(maruel): TEST ME
@@ skipping 126 matching lines @@
     self.assertEquals(o.description, 'description2')
     self.assertEquals(o.patch, None)
     self.assertEquals(o.GetFileNames(), ['foo', 'bar'])
     self.assertEquals(o.GetFiles(), files)
     self.assertEquals(o.GetLocalRoot(), self.fake_root_dir)
 
   def testLoadWithIssue(self):
     description = ["This is some description.", "force an extra separator."]
     gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
     gcl.os.path.exists('bleeeh').AndReturn(True)
-    gcl.ReadFile('bleeeh').AndReturn(
+    gcl.gclient_utils.FileRead('bleeeh', 'r').AndReturn(
       gcl.ChangeInfo._SEPARATOR.join(["42, 53", "G      b.cc"] + description))
     self.mox.ReplayAll()
 
     change_info = gcl.ChangeInfo.Load('bleh', self.fake_root_dir, True, False)
     self.assertEquals(change_info.name, 'bleh')
     self.assertEquals(change_info.issue, 42)
     self.assertEquals(change_info.patchset, 53)
     self.assertEquals(change_info.description,
                       gcl.ChangeInfo._SEPARATOR.join(description))
     self.assertEquals(change_info.GetFiles(), [('G      ', 'b.cc')])
 
   def testLoadEmpty(self):
     gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
     gcl.os.path.exists('bleeeh').AndReturn(True)
-    gcl.ReadFile('bleeeh').AndReturn(
+    gcl.gclient_utils.FileRead('bleeeh', 'r').AndReturn(
         gcl.ChangeInfo._SEPARATOR.join(["", "", ""]))
     self.mox.ReplayAll()
 
     change_info = gcl.ChangeInfo.Load('bleh', self.fake_root_dir, True, False)
     self.assertEquals(change_info.name, 'bleh')
     self.assertEquals(change_info.issue, 0)
     self.assertEquals(change_info.patchset, 0)
     self.assertEquals(change_info.description, "")
     self.assertEquals(change_info.GetFiles(), [])
 
@@ skipping 138 matching lines @@
     self.mox.ReplayAll()
 
     gcl.UploadCL(change_info, args)
     self.assertEquals(change_info.issue, 1)
     self.assertEquals(change_info.patchset, 2)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()