Reapply 32057, 32058, 32059, 32062 and fixes problems introduced by these changes.

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.gclient_scm, 'CaptureSVNInfo')
+    self.mox.StubOutWithMock(gcl.SVN, 'CaptureInfo')
     self.mox.StubOutWithMock(gcl, 'tempfile')
     self.mox.StubOutWithMock(gcl.upload, 'RealMain')
     # These are not tested.
     self.mox.StubOutWithMock(gcl, 'ReadFile')
     self.mox.StubOutWithMock(gcl, 'WriteFile')
 
 
 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',
-      'GetCacheDir', 'GetCachedFile', 'GetChangesDir', 'GetCLs',
-      'GetChangelistInfoFile', 'GetCodeReviewSetting', 'GetEditor',
-      'GetFilesNotInCL', 'GetInfoDir', 'GetIssueDescription',
-      'GetModifiedFiles', 'GetRepositoryRoot',
-      'GetSVNFileProperty', 'Help', 'IsSVNMoved',
-      'Lint', 'LoadChangelistInfoForMultiple',
-      'MISSING_TEST_MSG', 'Opened', 'OptionallyDoPresubmitChecks',
-      'PresubmitCL', 'ReadFile', 'REPOSITORY_ROOT', 'RunShell',
-      'RunShellWithReturnCode', 'SendToRietveld', 'TryChange',
-      'UnknownFiles', 'UploadCL', 'Warn', 'WriteFile',
-      'gclient_scm', 'gclient_utils', 'getpass', 'main', 'os', 'random', 're',
-      'shutil', 'string', 'subprocess', 'sys', 'tempfile',
-      'upload', 'urllib2',
+        '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',
+        'SendToRietveld', 'TryChange', 'UnknownFiles', 'UploadCL', 'Warn',
+        'WriteFile', '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
     pass
 
   def testGetSVNFileProperty(self):
     # TODO(maruel): TEST ME
     pass
 
   def testUnknownFiles(self):
     # TODO(maruel): TEST ME
     pass
 
   def testGetRepositoryRootNone(self):
     gcl.REPOSITORY_ROOT = None
     gcl.os.getcwd().AndReturn("/bleh/prout")
     result = {
       "Repository Root": ""
     }
-    gcl.gclient_scm.CaptureSVNInfo("/bleh/prout", print_error=False).AndReturn(
-        result)
+    gcl.SVN.CaptureInfo("/bleh/prout", print_error=False).AndReturn(result)
     self.mox.ReplayAll()
     self.assertRaises(Exception, gcl.GetRepositoryRoot)
 
   def testGetRepositoryRootGood(self):
     gcl.REPOSITORY_ROOT = None
     root_path = gcl.os.path.join('bleh', 'prout', 'pouet')
     gcl.os.getcwd().AndReturn(root_path)
     result1 = { "Repository Root": "Some root" }
-    gcl.gclient_scm.CaptureSVNInfo(root_path,
-                                   print_error=False).AndReturn(result1)
+    gcl.SVN.CaptureInfo(root_path, print_error=False).AndReturn(result1)
     gcl.os.getcwd().AndReturn(root_path)
     results2 = { "Repository Root": "A different root" }
-    gcl.gclient_scm.CaptureSVNInfo(
-        gcl.os.path.dirname(root_path),
-        print_error=False).AndReturn(results2)
+    gcl.SVN.CaptureInfo(gcl.os.path.dirname(root_path),
+                        print_error=False).AndReturn(results2)
     self.mox.ReplayAll()
     self.assertEquals(gcl.GetRepositoryRoot(), root_path)
 
   def testGetCachedFile(self):
     # TODO(maruel): TEST ME
     pass
 
   def testGetCodeReviewSetting(self):
     # TODO(maruel): TEST ME
     pass
@@ skipping 247 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()