Remove two seams options.gclient and options.scm_wrapper in gclient.

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
 #
@@ skipping 103 matching lines @@
     self._RunSVN = gclient.RunSVN
     gclient.RunSVN = self.mox.CreateMockAnything()
     self._RunSVNAndGetFileList = gclient.RunSVNAndGetFileList
     gclient.RunSVNAndGetFileList = self.mox.CreateMockAnything()
     self._sys_stdout = gclient.sys.stdout
     gclient.sys.stdout = self.mox.CreateMock(self._sys_stdout)
     self._subprocess = gclient.subprocess
     gclient.subprocess = self.mox.CreateMock(self._subprocess)
     self._os_path_exists = gclient.os.path.exists
     gclient.os.path.exists = self.mox.CreateMockAnything()
+    self._gclient_gclient = gclient.GClient
+    gclient.GClient = self.mox.CreateMockAnything()
+    self._scm_wrapper = gclient.SCMWrapper
+    gclient.SCMWrapper = self.mox.CreateMockAnything()
 
   def tearDown(self):
     gclient.CaptureSVN = self._CaptureSVN
     gclient.CaptureSVNInfo = self._CaptureSVNInfo
     gclient.CaptureSVNStatus = self._CaptureSVNStatus
     gclient.FileRead = self._FileRead
     gclient.FileWrite = self._FileWrite
     gclient.RemoveDirectory = self._RemoveDirectory
     gclient.RunSVN = self._RunSVN
     gclient.RunSVNAndGetFileList = self._RunSVNAndGetFileList
     gclient.sys.stdout = self._sys_stdout
     gclient.subprocess = self._subprocess
     gclient.os.path.exists = self._os_path_exists
+    gclient.GClient = self._gclient_gclient
+    gclient.SCMWrapper = self._scm_wrapper
 
 
 class GclientTestCase(GClientBaseTestCase):
   class OptionsObject(object):
     def __init__(self, test_case, verbose=False, spec=None,
                  config_filename='a_file_name',
                  entries_filename='a_entry_file_name',
                  deps_file='a_deps_file_name', force=False):
       self.verbose = verbose
       self.spec = spec
       self.config_filename = config_filename
       self.entries_filename = entries_filename
       self.deps_file = deps_file
       self.force = force
       self.revisions = []
       self.manually_grab_svn_rev = True
       self.deps_os = None
       self.head = False
 
       # Mox
       self.platform = test_case.platform
-      self.gclient = test_case.gclient
-      self.scm_wrapper = test_case.scm_wrapper
 
   def setUp(self):
     GClientBaseTestCase.setUp(self)
     self.platform = 'darwin'
 
-    self.gclient = self.mox.CreateMock(gclient.GClient)
-    self.scm_wrapper = self.mox.CreateMock(gclient.SCMWrapper)
-
     self.args = Args()
     self.root_dir = Dir()
     self.url = Url()
 
 
 class GClientCommandsTestCase(GClientBaseTestCase):
   def testCommands(self):
     known_commands = [gclient.DoCleanup, gclient.DoConfig, gclient.DoDiff,
                       gclient.DoHelp, gclient.DoStatus, gclient.DoUpdate,
                       gclient.DoRevert, gclient.DoRunHooks, gclient.DoRevInfo]
     for (k,v) in gclient.gclient_command_map.iteritems():
       # If it fails, you need to add a test case for the new command.
       self.assert_(v in known_commands)
     self.mox.ReplayAll()
     self.mox.VerifyAll()
 
 class TestDoConfig(GclientTestCase):
   def setUp(self):
     GclientTestCase.setUp(self)
-    # pymox has trouble to mock the class object and not a class instance.
-    self.gclient = self.mox.CreateMockAnything()
 
   def testMissingArgument(self):
     exception_msg = "required argument missing; see 'gclient help config'"
 
     self.mox.ReplayAll()
     self.assertRaisesError(exception_msg, gclient.DoConfig, self.Options(), ())
     self.mox.VerifyAll()
 
   def testExistingClientFile(self):
     options = self.Options()
     exception_msg = ('%s file already exists in the current directory' %
                         options.config_filename)
     gclient.os.path.exists(options.config_filename).AndReturn(True)
 
     self.mox.ReplayAll()
     self.assertRaisesError(exception_msg, gclient.DoConfig, options, (1,))
     self.mox.VerifyAll()
 
   def testFromText(self):
     options = self.Options(spec='config_source_content')
     gclient.os.path.exists(options.config_filename).AndReturn(False)
-    options.gclient('.', options).AndReturn(options.gclient)
-    options.gclient.SetConfig(options.spec)
-    options.gclient.SaveConfig()
+    gclient.GClient('.', options).AndReturn(gclient.GClient)
+    gclient.GClient.SetConfig(options.spec)
+    gclient.GClient.SaveConfig()
 
     self.mox.ReplayAll()
     gclient.DoConfig(options, (1,),)
     self.mox.VerifyAll()
 
   def testCreateClientFile(self):
     options = self.Options()
     gclient.os.path.exists(options.config_filename).AndReturn(False)
-    options.gclient('.', options).AndReturn(options.gclient)
-    options.gclient.SetDefaultConfig('the_name', 'http://svn/url/the_name',
+    gclient.GClient('.', options).AndReturn(gclient.GClient)
+    gclient.GClient.SetDefaultConfig('the_name', 'http://svn/url/the_name',
                                      'other')
-    options.gclient.SaveConfig()
+    gclient.GClient.SaveConfig()
 
     self.mox.ReplayAll()
     gclient.DoConfig(options,
                      ('http://svn/url/the_name', 'other', 'args', 'ignored'))
     self.mox.VerifyAll()
 
 
 class TestDoHelp(GclientTestCase):
   def testGetUsage(self):
     print(gclient.COMMAND_USAGE_TEXT['config'])
@@ skipping 14 matching lines @@
     self.mox.ReplayAll()
     options = self.Options()
     self.assertRaisesError("unknown subcommand 'xyzzy'; see 'gclient help'",
                            gclient.DoHelp, options, ('xyzzy',))
     self.mox.VerifyAll()
 
 
 class GenericCommandTestCase(GclientTestCase):
   def ReturnValue(self, command, function, return_value):
     options = self.Options()
-    self.gclient.LoadCurrentConfig(options).AndReturn(self.gclient)
-    self.gclient.RunOnDeps(command, self.args).AndReturn(return_value)
+    gclient.GClient.LoadCurrentConfig(options).AndReturn(gclient.GClient)
+    gclient.GClient.RunOnDeps(command, self.args).AndReturn(return_value)
 
     self.mox.ReplayAll()
     result = function(options, self.args)
     self.assertEquals(result, return_value)
     self.mox.VerifyAll()
 
   def BadClient(self, function):
     options = self.Options()
-    self.gclient.LoadCurrentConfig(options).AndReturn(None)
+    gclient.GClient.LoadCurrentConfig(options).AndReturn(None)
 
     self.mox.ReplayAll()
     self.assertRaisesError(
         "client not configured; see 'gclient config'",
         function, options, self.args)
     self.mox.VerifyAll()
 
   def Verbose(self, command, function):
     options = self.Options(verbose=True)
-    self.gclient.LoadCurrentConfig(options).AndReturn(self.gclient)
+    gclient.GClient.LoadCurrentConfig(options).AndReturn(gclient.GClient)
     text = "# Dummy content\nclient = 'my client'"
-    self.gclient.ConfigContent().AndReturn(text)
+    gclient.GClient.ConfigContent().AndReturn(text)
     print(text)
-    self.gclient.RunOnDeps(command, self.args).AndReturn(0)
+    gclient.GClient.RunOnDeps(command, self.args).AndReturn(0)
 
     self.mox.ReplayAll()
     result = function(options, self.args)
     self.assertEquals(result, 0)
     self.mox.VerifyAll()
 
 class TestDoCleanup(GenericCommandTestCase):
   def testGoodClient(self):
     self.ReturnValue('cleanup', gclient.DoCleanup, 0)
   def testError(self):
@@ skipping 21 matching lines @@
   def testBadClient(self):
     self.BadClient(gclient.DoRunHooks)
 
 
 class TestDoUpdate(GenericCommandTestCase):
   def Options(self, verbose=False, *args, **kwargs):
     return self.OptionsObject(self, verbose=verbose, *args, **kwargs)
 
   def ReturnValue(self, command, function, return_value):
     options = self.Options()
-    self.gclient.LoadCurrentConfig(options).AndReturn(self.gclient)
-    self.gclient.GetVar("solutions")
-    self.gclient.RunOnDeps(command, self.args).AndReturn(return_value)
+    gclient.GClient.LoadCurrentConfig(options).AndReturn(gclient.GClient)
+    gclient.GClient.GetVar("solutions")
+    gclient.GClient.RunOnDeps(command, self.args).AndReturn(return_value)
 
     self.mox.ReplayAll()
     result = function(options, self.args)
     self.assertEquals(result, return_value)
     self.mox.VerifyAll()
 
   def Verbose(self, command, function):
     options = self.Options(verbose=True)
-    self.gclient.LoadCurrentConfig(options).AndReturn(self.gclient)
-    self.gclient.GetVar("solutions")
+    gclient.GClient.LoadCurrentConfig(options).AndReturn(gclient.GClient)
+    gclient.GClient.GetVar("solutions")
     text = "# Dummy content\nclient = 'my client'"
-    self.gclient.ConfigContent().AndReturn(text)
+    gclient.GClient.ConfigContent().AndReturn(text)
     print(text)
-    self.gclient.RunOnDeps(command, self.args).AndReturn(0)
+    gclient.GClient.RunOnDeps(command, self.args).AndReturn(0)
 
     self.mox.ReplayAll()
     result = function(options, self.args)
     self.assertEquals(result, 0)
     self.mox.VerifyAll()
 
   def Options(self, verbose=False, *args, **kwargs):
     return self.OptionsObject(self, verbose=verbose, *args, **kwargs)
 
   def testBasic(self):
@@ skipping 31 matching lines @@
 
 class GClientClassTestCase(GclientTestCase):
   def testDir(self):
     members = [
       'ConfigContent', 'FromImpl', 'GetVar', 'LoadCurrentConfig',
       'RunOnDeps', 'SaveConfig', 'SetConfig', 'SetDefaultConfig',
       'supported_commands', 'PrintRevInfo',
     ]
 
     # If you add a member, be sure to add the relevant test!
-    self.compareMembers(gclient.GClient('root_dir', 'options'), members)
+    self.compareMembers(self._gclient_gclient('root_dir', 'options'), members)
 
   def testSetConfig_ConfigContent_GetVar_SaveConfig_SetDefaultConfig(self):
     options = self.Options()
     text = "# Dummy content\nclient = 'my client'"
     gclient.FileWrite(os.path.join(self.root_dir, options.config_filename),
                       text)
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(text)
     self.assertEqual(client.ConfigContent(), text)
     self.assertEqual(client.GetVar('client'), 'my client')
     self.assertEqual(client.GetVar('foo'), None)
     client.SaveConfig()
 
     solution_name = 'solution name'
     solution_url = 'solution url'
     safesync_url = 'safesync url'
     default_text = gclient.DEFAULT_CLIENT_FILE_TEXT % (solution_name,
                                                        solution_url,
                                                        safesync_url)
     client.SetDefaultConfig(solution_name, solution_url, safesync_url)
     self.assertEqual(client.ConfigContent(), default_text)
     solutions = [{
       'name': solution_name,
       'url': solution_url,
       'custom_deps': {},
       'safesync_url': safesync_url
     }]
     self.assertEqual(client.GetVar('solutions'), solutions)
     self.assertEqual(client.GetVar('foo'), None)
     self.mox.VerifyAll()
 
   def testLoadCurrentConfig(self):
-    # pymox has trouble to mock the class object and not a class instance.
-    self.gclient = self.mox.CreateMockAnything()
     options = self.Options()
     path = os.path.realpath(self.root_dir)
     gclient.os.path.exists(os.path.join(path, options.config_filename)
         ).AndReturn(True)
-    options.gclient(path, options).AndReturn(options.gclient)
-    options.gclient._LoadConfig()
+    gclient.GClient(path, options).AndReturn(gclient.GClient)
+    gclient.GClient._LoadConfig()
 
     self.mox.ReplayAll()
-    client = gclient.GClient.LoadCurrentConfig(options, self.root_dir)
+    client = self._gclient_gclient.LoadCurrentConfig(options, self.root_dir)
     self.mox.VerifyAll()
 
   def testRunOnDepsNoDeps(self):
     solution_name = 'testRunOnDepsNoDeps_solution_name'
     gclient_config = (
       "solutions = [ {\n"
       "  'name': '%s',\n"
       "  'url': '%s',\n"
       "  'custom_deps': {},\n"
       "} ]\n"
     ) % (solution_name, self.url)
 
     entries_content = (
       'entries = [\n'
       '  "%s",\n'
       ']\n'
     ) % solution_name
 
-    self.scm_wrapper = self.mox.CreateMockAnything()
-    scm_wrapper_sol = self.mox.CreateMock(gclient.SCMWrapper)
-
     options = self.Options()
 
     checkout_path = os.path.join(self.root_dir, solution_name)
     gclient.os.path.exists(os.path.join(checkout_path, '.git')).AndReturn(False)
     # Expect a check for the entries file and we say there is not one.
     gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
 
     # An scm will be requested for the solution.
-    options.scm_wrapper(self.url, self.root_dir, solution_name
+    scm_wrapper_sol = self.mox.CreateMockAnything()
+    gclient.SCMWrapper(self.url, self.root_dir, solution_name
         ).AndReturn(scm_wrapper_sol)
     # Then an update will be performed.
     scm_wrapper_sol.RunCommand('update', options, self.args, [])
     # Then an attempt will be made to read its DEPS file.
     gclient.FileRead(os.path.join(self.root_dir,
                      solution_name,
                      options.deps_file)).AndRaise(IOError(2, 'No DEPS file'))
 
     # After everything is done, an attempt is made to write an entries
     # file.
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
         entries_content)
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
     self.mox.VerifyAll()
 
   def testRunOnDepsRelativePaths(self):
     solution_name = 'testRunOnDepsRelativePaths_solution_name'
     gclient_config = (
       "solutions = [ {\n"
       "  'name': '%s',\n"
       "  'url': '%s',\n"
       "  'custom_deps': {},\n"
       "} ]\n"
     ) % (solution_name, self.url)
 
     deps = (
       "use_relative_paths = True\n"
       "deps = {\n"
       "  'src/t': 'svn://scm.t/trunk',\n"
       "}\n")
 
     entries_content = (
       'entries = [\n'
       '  "%s",\n'
       '  "%s",\n'
       ']\n'
     ) % (os.path.join(solution_name, 'src', 't'), solution_name)
 
-    self.scm_wrapper = self.mox.CreateMockAnything()
-    scm_wrapper_sol = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_t = self.mox.CreateMock(gclient.SCMWrapper)
+    scm_wrapper_sol = self.mox.CreateMockAnything()
+    scm_wrapper_t = self.mox.CreateMockAnything()
 
     options = self.Options()
 
     gclient.os.path.exists(os.path.join(self.root_dir, solution_name, 'src',
                                         't', '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, solution_name, '.git')
         ).AndReturn(False)
     # Expect a check for the entries file and we say there is not one.
     gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
 
     # An scm will be requested for the solution.
-    options.scm_wrapper(self.url, self.root_dir, solution_name
+    gclient.SCMWrapper(self.url, self.root_dir, solution_name
         ).AndReturn(scm_wrapper_sol)
     # Then an update will be performed.
     scm_wrapper_sol.RunCommand('update', options, self.args, [])
     # Then an attempt will be made to read its DEPS file.
     gclient.FileRead(os.path.join(self.root_dir,
                      solution_name,
                      options.deps_file)).AndReturn(deps)
 
     # Next we expect an scm to be request for dep src/t but it should
     # use the url specified in deps and the relative path should now
     # be relative to the DEPS file.
-    options.scm_wrapper(
+    gclient.SCMWrapper(
         'svn://scm.t/trunk',
         self.root_dir,
         os.path.join(solution_name, "src", "t")).AndReturn(scm_wrapper_t)
     scm_wrapper_t.RunCommand('update', options, self.args, [])
 
     # After everything is done, an attempt is made to write an entries
     # file.
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
         entries_content)
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
     self.mox.VerifyAll()
 
   def testRunOnDepsCustomDeps(self):
     solution_name = 'testRunOnDepsCustomDeps_solution_name'
     gclient_config = (
       "solutions = [ {\n"
       "  'name': '%s',\n"
       "  'url': '%s',\n"
@@ skipping 12 matching lines @@
     )
 
     entries_content = (
       'entries = [\n'
       '  "%s",\n'
       '  "src/n",\n'
       '  "src/t",\n'
       ']\n'
     ) % solution_name
 
-    self.scm_wrapper = self.mox.CreateMockAnything()
-    scm_wrapper_sol = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_t = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_n = self.mox.CreateMock(gclient.SCMWrapper)
+    scm_wrapper_sol = self.mox.CreateMockAnything()
+    scm_wrapper_t = self.mox.CreateMockAnything()
+    scm_wrapper_n = self.mox.CreateMockAnything()
 
     options = self.Options()
 
     checkout_path = os.path.join(self.root_dir, solution_name)
     gclient.os.path.exists(os.path.join(checkout_path, '.git')).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, 'src/n', '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, 'src/t', '.git')
         ).AndReturn(False)
 
     # Expect a check for the entries file and we say there is not one.
     gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
 
     # An scm will be requested for the solution.
-    options.scm_wrapper(self.url, self.root_dir, solution_name
+    gclient.SCMWrapper(self.url, self.root_dir, solution_name
         ).AndReturn(scm_wrapper_sol)
     # Then an update will be performed.
     scm_wrapper_sol.RunCommand('update', options, self.args, [])
     # Then an attempt will be made to read its DEPS file.
     gclient.FileRead(os.path.join(checkout_path, options.deps_file)
         ).AndReturn(deps)
 
     # Next we expect an scm to be request for dep src/n even though it does not
     # exist in the DEPS file.
-    options.scm_wrapper('svn://custom.n/trunk',
-                        self.root_dir,
-                        "src/n").AndReturn(scm_wrapper_n)
+    gclient.SCMWrapper('svn://custom.n/trunk',
+                       self.root_dir,
+                       "src/n").AndReturn(scm_wrapper_n)
 
     # Next we expect an scm to be request for dep src/t but it should
     # use the url specified in custom_deps.
-    options.scm_wrapper('svn://custom.t/trunk',
-                        self.root_dir,
-                        "src/t").AndReturn(scm_wrapper_t)
+    gclient.SCMWrapper('svn://custom.t/trunk',
+                       self.root_dir,
+                       "src/t").AndReturn(scm_wrapper_t)
 
     scm_wrapper_n.RunCommand('update', options, self.args, [])
     scm_wrapper_t.RunCommand('update', options, self.args, [])
 
     # NOTE: the dep src/b should not create an scm at all.
 
     # After everything is done, an attempt is made to write an entries
     # file.
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
         entries_content)
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
     self.mox.VerifyAll()
 
   # Regression test for Issue #11.
   # http://code.google.com/p/gclient/issues/detail?id=11
   def testRunOnDepsSharedDependency(self):
     name_a = 'testRunOnDepsSharedDependency_a'
     name_b = 'testRunOnDepsSharedDependency_b'
 
@@ skipping 17 matching lines @@
       "deps = {\n"
       "  'src/t' : 'http://svn.t/trunk',\n"
     "}\n")
 
     entries_content = (
       'entries = [\n  "%s",\n'
       '  "%s",\n'
       '  "src/t",\n'
       ']\n') % (name_a, name_b)
 
-    self.scm_wrapper = self.mox.CreateMockAnything()
-    scm_wrapper_a = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_b = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_dep = self.mox.CreateMock(gclient.SCMWrapper)
+    scm_wrapper_a = self.mox.CreateMockAnything()
+    scm_wrapper_b = self.mox.CreateMockAnything()
+    scm_wrapper_dep = self.mox.CreateMockAnything()
 
     options = self.Options()
 
     gclient.os.path.exists(os.path.join(self.root_dir, name_a, '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, name_b, '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, 'src/t', '.git')
         ).AndReturn(False)
 
     # Expect a check for the entries file and we say there is not one.
     gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
 
     # An scm will be requested for the first solution.
-    options.scm_wrapper(url_a, self.root_dir, name_a).AndReturn(
+    gclient.SCMWrapper(url_a, self.root_dir, name_a).AndReturn(
         scm_wrapper_a)
     # Then an attempt will be made to read it's DEPS file.
     gclient.FileRead(os.path.join(self.root_dir, name_a, options.deps_file)
         ).AndReturn(deps_a)
     # Then an update will be performed.
     scm_wrapper_a.RunCommand('update', options, self.args, [])
 
     # An scm will be requested for the second solution.
-    options.scm_wrapper(url_b, self.root_dir, name_b).AndReturn(
+    gclient.SCMWrapper(url_b, self.root_dir, name_b).AndReturn(
         scm_wrapper_b)
     # Then an attempt will be made to read its DEPS file.
     gclient.FileRead(os.path.join(self.root_dir, name_b, options.deps_file)
         ).AndReturn(deps_b)
     # Then an update will be performed.
     scm_wrapper_b.RunCommand('update', options, self.args, [])
 
     # Finally, an scm is requested for the shared dep.
-    options.scm_wrapper('http://svn.t/trunk', self.root_dir, 'src/t'
+    gclient.SCMWrapper('http://svn.t/trunk', self.root_dir, 'src/t'
         ).AndReturn(scm_wrapper_dep)
     # And an update is run on it.
     scm_wrapper_dep.RunCommand('update', options, self.args, [])
 
     # After everything is done, an attempt is made to write an entries file.
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
         entries_content)
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
     self.mox.VerifyAll()
 
   def testRunOnDepsSuccess(self):
     # Fake .gclient file.
     name = 'testRunOnDepsSuccess_solution_name'
     gclient_config = """solutions = [ {
   'name': '%s',
   'url': '%s',
   'custom_deps': {},
 }, ]""" % (name, self.url)
 
-    # pymox has trouble to mock the class object and not a class instance.
-    self.scm_wrapper = self.mox.CreateMockAnything()
     options = self.Options()
     gclient.os.path.exists(os.path.join(self.root_dir, name, '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
-    options.scm_wrapper(self.url, self.root_dir, name).AndReturn(
-        options.scm_wrapper)
-    options.scm_wrapper.RunCommand('update', options, self.args, [])
+    gclient.SCMWrapper(self.url, self.root_dir, name).AndReturn(
+        gclient.SCMWrapper)
+    gclient.SCMWrapper.RunCommand('update', options, self.args, [])
     gclient.FileRead(os.path.join(self.root_dir, name, options.deps_file)
         ).AndReturn("Boo = 'a'")
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
                       'entries = [\n  "%s",\n]\n' % name)
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
     self.mox.VerifyAll()
 
   def testRunOnDepsRevisions(self):
     def OptIsRev(options, rev):
       if not options.revision == str(rev):
         print("options.revision = %s" % options.revision)
       return options.revision == str(rev)
     def OptIsRevNone(options):
@@ skipping 30 matching lines @@
     entries_content = (
       'entries = [\n  "src",\n'
       '  "foo/third_party/WebKit",\n'
       '  "src/third_party/cygwin",\n'
       '  "src/third_party/python_24",\n'
       '  "src/breakpad/bar",\n'
       ']\n')
     cygwin_path = 'dummy path cygwin'
     webkit_path = 'dummy path webkit'
 
-    # pymox has trouble to mock the class object and not a class instance.
-    self.scm_wrapper = self.mox.CreateMockAnything()
-    scm_wrapper_bleh = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_src = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_src2 = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_webkit = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_breakpad = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_cygwin = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_python = self.mox.CreateMock(gclient.SCMWrapper)
+    scm_wrapper_bleh = self.mox.CreateMockAnything()
+    scm_wrapper_src = self.mox.CreateMockAnything()
+    scm_wrapper_src2 = self.mox.CreateMockAnything()
+    scm_wrapper_webkit = self.mox.CreateMockAnything()
+    scm_wrapper_breakpad = self.mox.CreateMockAnything()
+    scm_wrapper_cygwin = self.mox.CreateMockAnything()
+    scm_wrapper_python = self.mox.CreateMockAnything()
     options = self.Options()
     options.revisions = [ 'src@123', 'foo/third_party/WebKit@42',
                           'src/third_party/cygwin@333' ]
 
     # Also, pymox doesn't verify the order of function calling w.r.t. different
     # mock objects. Pretty lame. So reorder as we wish to make it clearer.
     gclient.FileRead(os.path.join(self.root_dir, 'src', options.deps_file)
         ).AndReturn(deps_content)
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
                       entries_content)
 
     gclient.os.path.exists(os.path.join(self.root_dir, 'src', '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, 'foo/third_party/WebKit',
                                         '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, 'src/third_party/cygwin',
                                         '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir,
                                          'src/third_party/python_24', '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, 'src/breakpad/bar',
                                         '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
 
-    options.scm_wrapper(self.url, self.root_dir, 'src').AndReturn(
+    gclient.SCMWrapper(self.url, self.root_dir, 'src').AndReturn(
         scm_wrapper_src)
     scm_wrapper_src.RunCommand('update', mox.Func(OptIsRev123), self.args, [])
 
-    options.scm_wrapper(self.url, self.root_dir,
-                        None).AndReturn(scm_wrapper_src2)
+    gclient.SCMWrapper(self.url, self.root_dir,
+                       None).AndReturn(scm_wrapper_src2)
     scm_wrapper_src2.FullUrlForRelativeUrl('/trunk/deps/third_party/cygwin@3248'
         ).AndReturn(cygwin_path)
 
-    options.scm_wrapper(self.url, self.root_dir,
-                        None).AndReturn(scm_wrapper_src2)
+    gclient.SCMWrapper(self.url, self.root_dir,
+                       None).AndReturn(scm_wrapper_src2)
     scm_wrapper_src2.FullUrlForRelativeUrl('/trunk/deps/third_party/WebKit'
         ).AndReturn(webkit_path)
 
-    options.scm_wrapper(webkit_path, self.root_dir,
-                        'foo/third_party/WebKit').AndReturn(scm_wrapper_webkit)
+    gclient.SCMWrapper(webkit_path, self.root_dir,
+                       'foo/third_party/WebKit').AndReturn(scm_wrapper_webkit)
     scm_wrapper_webkit.RunCommand('update', mox.Func(OptIsRev42), self.args, [])
 
-    options.scm_wrapper(
+    gclient.SCMWrapper(
         'http://google-breakpad.googlecode.com/svn/trunk/src@285',
         self.root_dir, 'src/breakpad/bar').AndReturn(scm_wrapper_breakpad)
     scm_wrapper_breakpad.RunCommand('update', mox.Func(OptIsRevNone),
                                     self.args, [])
 
-    options.scm_wrapper(cygwin_path, self.root_dir,
-                        'src/third_party/cygwin').AndReturn(scm_wrapper_cygwin)
+    gclient.SCMWrapper(cygwin_path, self.root_dir,
+                       'src/third_party/cygwin').AndReturn(scm_wrapper_cygwin)
     scm_wrapper_cygwin.RunCommand('update', mox.Func(OptIsRev333), self.args,
                                   [])
 
-    options.scm_wrapper('svn://random_server:123/trunk/python_24@5580',
-                        self.root_dir,
-                        'src/third_party/python_24').AndReturn(
+    gclient.SCMWrapper('svn://random_server:123/trunk/python_24@5580',
+                       self.root_dir,
+                       'src/third_party/python_24').AndReturn(
                             scm_wrapper_python)
     scm_wrapper_python.RunCommand('update', mox.Func(OptIsRevNone), self.args,
                                   [])
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
     self.mox.VerifyAll()
 
   def testRunOnDepsConflictingRevisions(self):
     # Fake .gclient file.
     name = 'testRunOnDepsConflictingRevisions_solution_name'
     gclient_config = """solutions = [ {
   'name': '%s',
   'url': '%s',
   'custom_deps': {},
   'custom_vars': {},
 }, ]""" % (name, self.url)
     # Fake DEPS file.
     deps_content = """deps = {
   'foo/third_party/WebKit': '/trunk/deps/third_party/WebKit',
 }"""
 
     options = self.Options()
     options.revisions = [ 'foo/third_party/WebKit@42',
                           'foo/third_party/WebKit@43' ]
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     exception = "Conflicting revision numbers specified."
     try:
       client.RunOnDeps('update', self.args)
     except gclient.Error, e:
       self.assertEquals(e.args[0], exception)
     else:
       self.fail('%s not raised' % exception)
 
   def testRunOnDepsSuccessVars(self):
@@ skipping 11 matching lines @@
 }
 deps = {
   'foo/third_party/WebKit': Var('webkit') + 'WebKit',
 }"""
     entries_content = (
       'entries = [\n  "foo/third_party/WebKit",\n'
       '  "%s",\n'
       ']\n') % name
     webkit_path = 'dummy path webkit'
 
-    # pymox has trouble to mock the class object and not a class instance.
-    self.scm_wrapper = self.mox.CreateMockAnything()
-    scm_wrapper_webkit = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_src = self.mox.CreateMock(gclient.SCMWrapper)
+    scm_wrapper_webkit = self.mox.CreateMockAnything()
+    scm_wrapper_src = self.mox.CreateMockAnything()
 
     options = self.Options()
     gclient.FileRead(os.path.join(self.root_dir, name, options.deps_file)
         ).AndReturn(deps_content)
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
                       entries_content)
 
     gclient.os.path.exists(os.path.join(self.root_dir, 'foo/third_party/WebKit',
                                         '.git')).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, name, '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
-    options.scm_wrapper(self.url, self.root_dir, name).AndReturn(
-        options.scm_wrapper)
-    options.scm_wrapper.RunCommand('update', options, self.args, [])
+    gclient.SCMWrapper(self.url, self.root_dir, name).AndReturn(
+        gclient.SCMWrapper)
+    gclient.SCMWrapper.RunCommand('update', options, self.args, [])
 
-    options.scm_wrapper(self.url, self.root_dir,
-                        None).AndReturn(scm_wrapper_src)
+    gclient.SCMWrapper(self.url, self.root_dir,
+                       None).AndReturn(scm_wrapper_src)
     scm_wrapper_src.FullUrlForRelativeUrl('/trunk/bar/WebKit'
         ).AndReturn(webkit_path)
 
-    options.scm_wrapper(webkit_path, self.root_dir,
-                        'foo/third_party/WebKit').AndReturn(options.scm_wrapper)
-    options.scm_wrapper.RunCommand('update', options, self.args, [])
+    gclient.SCMWrapper(webkit_path, self.root_dir,
+                       'foo/third_party/WebKit').AndReturn(gclient.SCMWrapper)
+    gclient.SCMWrapper.RunCommand('update', options, self.args, [])
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
     self.mox.VerifyAll()
 
   def testRunOnDepsSuccessCustomVars(self):
     # Fake .gclient file.
     name = 'testRunOnDepsSuccessCustomVars_solution_name'
     gclient_config = """solutions = [ {
   'name': '%s',
   'url': '%s',
   'custom_deps': {},
   'custom_vars': {'webkit': '/trunk/bar_custom/'},
 }, ]""" % (name, self.url)
     # Fake DEPS file.
     deps_content = """vars = {
   'webkit': '/trunk/bar/',
 }
 deps = {
   'foo/third_party/WebKit': Var('webkit') + 'WebKit',
 }"""
     entries_content = (
       'entries = [\n  "foo/third_party/WebKit",\n'
       '  "%s",\n'
       ']\n') % name
     webkit_path = 'dummy path webkit'
 
-    # pymox has trouble to mock the class object and not a class instance.
-    self.scm_wrapper = self.mox.CreateMockAnything()
-    scm_wrapper_webkit = self.mox.CreateMock(gclient.SCMWrapper)
-    scm_wrapper_src = self.mox.CreateMock(gclient.SCMWrapper)
+    scm_wrapper_webkit = self.mox.CreateMockAnything()
+    scm_wrapper_src = self.mox.CreateMockAnything()
 
     options = self.Options()
     gclient.FileRead(os.path.join(self.root_dir, name, options.deps_file)
         ).AndReturn(deps_content)
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
                       entries_content)
 
     gclient.os.path.exists(os.path.join(self.root_dir, 'foo/third_party/WebKit',
                                         '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, name, '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
-    options.scm_wrapper(self.url, self.root_dir, name).AndReturn(
-        options.scm_wrapper)
-    options.scm_wrapper.RunCommand('update', options, self.args, [])
+    gclient.SCMWrapper(self.url, self.root_dir, name).AndReturn(
+        gclient.SCMWrapper)
+    gclient.SCMWrapper.RunCommand('update', options, self.args, [])
 
-    options.scm_wrapper(self.url, self.root_dir,
-                        None).AndReturn(scm_wrapper_src)
+    gclient.SCMWrapper(self.url, self.root_dir,
+                       None).AndReturn(scm_wrapper_src)
     scm_wrapper_src.FullUrlForRelativeUrl('/trunk/bar_custom/WebKit'
         ).AndReturn(webkit_path)
 
-    options.scm_wrapper(webkit_path, self.root_dir,
-                        'foo/third_party/WebKit').AndReturn(options.scm_wrapper)
-    options.scm_wrapper.RunCommand('update', options, self.args, [])
+    gclient.SCMWrapper(webkit_path, self.root_dir,
+                       'foo/third_party/WebKit').AndReturn(gclient.SCMWrapper)
+    gclient.SCMWrapper.RunCommand('update', options, self.args, [])
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
     self.mox.VerifyAll()
 
   def testRunOnDepsFailueVars(self):
     # Fake .gclient file.
     name = 'testRunOnDepsFailureVars_solution_name'
     gclient_config = """solutions = [ {
   'name': '%s',
   'url': '%s',
   'custom_deps': {},
   'custom_vars': {},
 }, ]""" % (name, self.url)
     # Fake DEPS file.
     deps_content = """deps = {
   'foo/third_party/WebKit': Var('webkit') + 'WebKit',
 }"""
 
-    # pymox has trouble to mock the class object and not a class instance.
-    self.scm_wrapper = self.mox.CreateMockAnything()
-
     options = self.Options()
     gclient.FileRead(os.path.join(self.root_dir, name, options.deps_file)
         ).AndReturn(deps_content)
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
                       'dummy entries content')
 
     gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
-    options.scm_wrapper(self.url, self.root_dir, name).AndReturn(
-        options.scm_wrapper)
-    options.scm_wrapper.RunCommand('update', options, self.args, [])
+    gclient.SCMWrapper(self.url, self.root_dir, name).AndReturn(
+        gclient.SCMWrapper)
+    gclient.SCMWrapper.RunCommand('update', options, self.args, [])
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     exception = "Var is not defined: webkit"
     try:
       client.RunOnDeps('update', self.args)
     except gclient.Error, e:
       self.assertEquals(e.args[0], exception)
     else:
       self.fail('%s not raised' % exception)
 
   def testRunOnDepsFailureInvalidCommand(self):
     options = self.Options()
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     exception = "'foo' is an unsupported command"
-    self.assertRaisesError(exception, gclient.GClient.RunOnDeps, client, 'foo',
-                           self.args)
+    self.assertRaisesError(exception, self._gclient_gclient.RunOnDeps, client,
+                           'foo', self.args)
     self.mox.VerifyAll()
 
   def testRunOnDepsFailureEmpty(self):
     options = self.Options()
 
     self.mox.ReplayAll()
-    client = gclient.GClient(self.root_dir, options)
+    client = self._gclient_gclient(self.root_dir, options)
     exception = "No solution specified"
-    self.assertRaisesError(exception, gclient.GClient.RunOnDeps, client,
+    self.assertRaisesError(exception, self._gclient_gclient.RunOnDeps, client,
                            'update', self.args)
     self.mox.VerifyAll()
 
   def testFromImpl(self):
     # TODO(maruel):  Test me!
     pass
 
   def test_PrintRevInfo(self):
     # TODO(aharper): no test yet for revinfo, lock it down once we've verified
     # implementation for Pulse plugin
@@ skipping 36 matching lines @@
     GClientBaseTestCase.tearDown(self)
     gclient.os.path.isdir = self._os_path_isdir
 
   def testDir(self):
     members = [
       'FullUrlForRelativeUrl', 'RunCommand', 'cleanup', 'diff', 'relpath',
       'revert', 'scm_name', 'status', 'update', 'url',
     ]
 
     # If you add a member, be sure to add the relevant test!
-    self.compareMembers(gclient.SCMWrapper(), members)
+    self.compareMembers(self._scm_wrapper(), members)
 
   def testFullUrlForRelativeUrl(self):
     self.url = 'svn://a/b/c/d'
 
     self.mox.ReplayAll()
-    scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
-                             relpath=self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     self.assertEqual(scm.FullUrlForRelativeUrl('/crap'), 'svn://a/b/crap')
     self.mox.VerifyAll()
 
   def testRunCommandException(self):
     options = self.Options(verbose=False)
     gclient.os.path.exists(os.path.join(self.root_dir, self.relpath, '.git')
         ).AndReturn(False)
 
     self.mox.ReplayAll()
-    scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
-                             relpath=self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     exception = "Unsupported argument(s): %s" % ','.join(self.args)
-    self.assertRaisesError(exception, gclient.SCMWrapper.RunCommand,
+    self.assertRaisesError(exception, self._scm_wrapper.RunCommand,
                            scm, 'update', options, self.args)
     self.mox.VerifyAll()
 
   def testRunCommandUnknown(self):
     # TODO(maruel): if ever used.
     pass
 
   def testRevertMissing(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir(base_path).AndReturn(False)
     # It'll to a checkout instead.
     gclient.os.path.exists(os.path.join(base_path, '.git')).AndReturn(False)
     print("\n_____ %s is missing, synching instead" % self.relpath)
     # Checkout.
     gclient.os.path.exists(base_path).AndReturn(False)
     files_list = self.mox.CreateMockAnything()
     gclient.RunSVNAndGetFileList(['checkout', self.url, base_path],
                                  self.root_dir, files_list)
 
     self.mox.ReplayAll()
-    scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
-                             relpath=self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     scm.revert(options, self.args, files_list)
     self.mox.VerifyAll()
 
   def testRevertNone(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir(base_path).AndReturn(True)
     gclient.CaptureSVNStatus(base_path).AndReturn([])
 
     self.mox.ReplayAll()
-    scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
-                             relpath=self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.mox.VerifyAll()
 
   def testRevert2Files(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir(base_path).AndReturn(True)
     items = [
       ('M      ', 'a'),
       ('A      ', 'b'),
     ]
     gclient.CaptureSVNStatus(base_path).AndReturn(items)
 
     print(os.path.join(base_path, 'a'))
     print(os.path.join(base_path, 'b'))
     gclient.RunSVN(['revert', 'a', 'b'], base_path)
 
     self.mox.ReplayAll()
-    scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
-                             relpath=self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
     self.mox.VerifyAll()
 
   def testStatus(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir(base_path).AndReturn(True)
     gclient.RunSVNAndGetFileList(['status'] + self.args, base_path,
                                  []).AndReturn(None)
 
     self.mox.ReplayAll()
-    scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
-                             relpath=self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     file_list = []
     self.assertEqual(scm.status(options, self.args, file_list), None)
     self.mox.VerifyAll()
 
 
   # TODO(maruel):  TEST REVISIONS!!!
   # TODO(maruel):  TEST RELOCATE!!!
   def testUpdateCheckout(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     file_info = gclient.PrintableObject()
     file_info.root = 'blah'
     file_info.url = self.url
     file_info.uuid = 'ABC'
     file_info.revision = 42
     gclient.os.path.exists(os.path.join(base_path, '.git')).AndReturn(False)
     # Checkout.
     gclient.os.path.exists(base_path).AndReturn(False)
     files_list = self.mox.CreateMockAnything()
     gclient.RunSVNAndGetFileList(['checkout', self.url, base_path],
                                  self.root_dir, files_list)
     self.mox.ReplayAll()
-    scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
-                             relpath=self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     scm.update(options, (), files_list)
     self.mox.VerifyAll()
 
   def testUpdateUpdate(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     options.force = True
     file_info = {
       'Repository Root': 'blah',
       'URL': self.url,
       'UUID': 'ABC',
       'Revision': 42,
     }
     gclient.os.path.exists(os.path.join(base_path, '.git')).AndReturn(False)
     # Checkout or update.
     gclient.os.path.exists(base_path).AndReturn(True)
     gclient.CaptureSVNInfo(os.path.join(base_path, "."), '.'
         ).AndReturn(file_info)
     # Cheat a bit here.
     gclient.CaptureSVNInfo(file_info['URL'], '.').AndReturn(file_info)
     additional_args = []
     if options.manually_grab_svn_rev:
       additional_args = ['--revision', str(file_info['Revision'])]
     files_list = []
     gclient.RunSVNAndGetFileList(['update', base_path] + additional_args,
                                  self.root_dir, files_list)
 
     self.mox.ReplayAll()
-    scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
-                             relpath=self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     scm.update(options, (), files_list)
     self.mox.VerifyAll()
 
   def testUpdateGit(self):
     options = self.Options(verbose=True)
     gclient.os.path.exists(os.path.join(self.root_dir, self.relpath, '.git')
         ).AndReturn(True)
     print("________ found .git directory; skipping %s" % self.relpath)
 
     self.mox.ReplayAll()
-    scm = gclient.SCMWrapper(url=self.url, root_dir=self.root_dir,
-                             relpath=self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     file_list = []
     scm.update(options, self.args, file_list)
     self.mox.VerifyAll()
 
   def testGetSVNFileInfo(self):
     xml_text = r"""<?xml version="1.0"?>
 <info>
 <entry kind="file" path="%s" revision="14628">
 <url>http://src.chromium.org/svn/trunk/src/chrome/app/d</url>
 <repository><root>http://src.chromium.org/svn</root></repository>
@@ skipping 192 matching lines @@
 """
     gclient.CaptureSVN = CaptureSVNMock
     info = gclient.CaptureSVNStatus(None)
     self.assertEquals(info, [])
 
 
 if __name__ == '__main__':
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: