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

tests/gclient_test.py

 #!/usr/bin/python
 #
 # Copyright 2008-2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 """Unit tests for gclient.py."""
 
 __author__ = 'stephen5.ng@gmail.com (Stephen Ng)'
 
 import __builtin__
 import StringIO
 
 import gclient
-# Temporary due to the "from scm import *" in gclient_scm.
-import scm
 from super_mox import mox, IsOneOf, SuperMoxTestBase
 
 
 class BaseTestCase(SuperMoxTestBase):
   # Like unittest's assertRaises, but checks for Gclient.Error.
   def assertRaisesError(self, msg, fn, *args, **kwargs):
     try:
       fn(*args, **kwargs)
     except gclient.gclient_utils.Error, e:
       self.assertEquals(e.args[0], msg)
     else:
       self.fail('%s not raised' % msg)
 
 
 class GClientBaseTestCase(BaseTestCase):
   def Options(self, *args, **kwargs):
     return self.OptionsObject(self, *args, **kwargs)
 
   def setUp(self):
     BaseTestCase.setUp(self)
     # These are not tested.
     self.mox.StubOutWithMock(gclient.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(gclient.gclient_utils, 'FileWrite')
     self.mox.StubOutWithMock(gclient.gclient_utils, 'SubprocessCall')
     self.mox.StubOutWithMock(gclient.gclient_utils, 'RemoveDirectory')
     # Mock them to be sure nothing bad happens.
-    self.mox.StubOutWithMock(gclient.gclient_scm, 'CaptureSVN')
-    self.mox.StubOutWithMock(gclient.gclient_scm, 'CaptureSVNInfo')
-    self.mox.StubOutWithMock(gclient.gclient_scm, 'CaptureSVNStatus')
-    self.mox.StubOutWithMock(gclient.gclient_scm, 'RunSVN')
-    self.mox.StubOutWithMock(gclient.gclient_scm, 'RunSVNAndGetFileList')
-    self.mox.StubOutWithMock(scm, 'CaptureSVN')
-    self.mox.StubOutWithMock(scm, 'CaptureSVNInfo')
-    self.mox.StubOutWithMock(scm, 'CaptureSVNStatus')
-    self.mox.StubOutWithMock(scm, 'RunSVN')
-    self.mox.StubOutWithMock(scm, 'RunSVNAndGetFileList')
+    self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'Capture')
+    self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'CaptureInfo')
+    self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'CaptureStatus')
+    self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'Run')
+    self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'RunAndGetFileList')
     self._gclient_gclient = gclient.GClient
     gclient.GClient = self.mox.CreateMockAnything()
     self._scm_wrapper = gclient.gclient_scm.CreateSCM
     gclient.gclient_scm.CreateSCM = self.mox.CreateMockAnything()
 
   def tearDown(self):
     gclient.GClient = self._gclient_gclient
     gclient.gclient_scm.CreateSCM = self._scm_wrapper
     BaseTestCase.tearDown(self)
 
@@ skipping 998 matching lines @@
     pass
   def test_VarImpl(self):
     pass
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: