Revert "Use a factory method to abstract SCMWrapper creation." totally broke 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 52 matching lines @@
     BaseTestCase.setUp(self)
     # Mock them to be sure nothing bad happens.
     self.mox.StubOutWithMock(gclient_scm, 'CaptureSVN')
     self._CaptureSVNInfo = gclient_scm.CaptureSVNInfo
     self.mox.StubOutWithMock(gclient_scm, 'CaptureSVNInfo')
     self.mox.StubOutWithMock(gclient_scm, 'CaptureSVNStatus')
     self.mox.StubOutWithMock(gclient_scm, 'RunSVN')
     self.mox.StubOutWithMock(gclient_scm, 'RunSVNAndGetFileList')
     self._gclient_gclient = gclient.GClient
     gclient.GClient = self.mox.CreateMockAnything()
-    self._scm_wrapper = gclient_scm.create_scm
-    gclient_scm.create_scm = self.mox.CreateMockAnything()
+    self._scm_wrapper = gclient_scm.SCMWrapper
+    gclient_scm.SCMWrapper = self.mox.CreateMockAnything()
 
   def tearDown(self):
     gclient.GClient = self._gclient_gclient
-    gclient_scm.create_scm = self._scm_wrapper
+    gclient_scm.SCMWrapper = self._scm_wrapper
     BaseTestCase.tearDown(self)
 
 
 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, nohooks=False):
       self.verbose = verbose
@@ skipping 312 matching lines @@
     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.
     scm_wrapper_sol = self.mox.CreateMockAnything()
-    gclient_scm.create_scm(self.url, self.root_dir, solution_name
+    gclient_scm.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.
@@ skipping 36 matching lines @@
     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.
-    gclient_scm.create_scm(self.url, self.root_dir, solution_name
+    gclient_scm.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.
-    gclient_scm.create_scm(
+    gclient_scm.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)
 
@@ skipping 41 matching lines @@
     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.
-    gclient_scm.create_scm(self.url, self.root_dir, solution_name
+    gclient_scm.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.
-    gclient_scm.create_scm('svn://custom.n/trunk',
-                           self.root_dir,
-                           "src/n").AndReturn(scm_wrapper_n)
+    gclient_scm.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.
-    gclient_scm.create_scm('svn://custom.t/trunk',
+    gclient_scm.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.
@@ skipping 49 matching lines @@
     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.
-    gclient_scm.create_scm(url_a, self.root_dir, name_a).AndReturn(
+    gclient_scm.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.
-    gclient_scm.create_scm(url_b, self.root_dir, name_b).AndReturn(
+    gclient_scm.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.
-    gclient_scm.create_scm('http://svn.t/trunk', self.root_dir, 'src/t'
+    gclient_scm.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 = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
 
   def testRunOnDepsSuccess(self):
     # Fake .gclient file.
     name = 'testRunOnDepsSuccess_solution_name'
     gclient_config = """solutions = [ {
   'name': '%s',
   'url': '%s',
   'custom_deps': {},
 }, ]""" % (name, self.url)
 
     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)
-    gclient_scm.create_scm(self.url, self.root_dir, name).AndReturn(
-        gclient_scm.create_scm)
-    gclient_scm.create_scm.RunCommand('update', options, self.args, [])
+    gclient_scm.SCMWrapper(self.url, self.root_dir, name).AndReturn(
+        gclient_scm.SCMWrapper)
+    gclient_scm.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 = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
 
@@ skipping 71 matching lines @@
         ).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)
 
-    gclient_scm.create_scm(self.url, self.root_dir, 'src').AndReturn(
+    gclient_scm.SCMWrapper(self.url, self.root_dir, 'src').AndReturn(
         scm_wrapper_src)
     scm_wrapper_src.RunCommand('update', mox.Func(OptIsRev123), self.args, [])
 
-    gclient_scm.create_scm(self.url, self.root_dir,
+    gclient_scm.SCMWrapper(self.url, self.root_dir,
                        None).AndReturn(scm_wrapper_src2)
     scm_wrapper_src2.FullUrlForRelativeUrl('/trunk/deps/third_party/cygwin@3248'
         ).AndReturn(cygwin_path)
 
-    gclient_scm.create_scm(self.url, self.root_dir,
+    gclient_scm.SCMWrapper(self.url, self.root_dir,
                        None).AndReturn(scm_wrapper_src2)
     scm_wrapper_src2.FullUrlForRelativeUrl('/trunk/deps/third_party/WebKit'
         ).AndReturn(webkit_path)
 
-    gclient_scm.create_scm(webkit_path, self.root_dir,
+    gclient_scm.SCMWrapper(webkit_path, self.root_dir,
                        'foo/third_party/WebKit').AndReturn(scm_wrapper_webkit)
     scm_wrapper_webkit.RunCommand('update', mox.Func(OptIsRev42), self.args, [])
 
-    gclient_scm.create_scm(
+    gclient_scm.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, [])
 
-    gclient_scm.create_scm(cygwin_path, self.root_dir,
+    gclient_scm.SCMWrapper(cygwin_path, self.root_dir,
                        'src/third_party/cygwin').AndReturn(scm_wrapper_cygwin)
     scm_wrapper_cygwin.RunCommand('update', mox.Func(OptIsRev333), self.args,
                                   [])
 
-    gclient_scm.create_scm('svn://random_server:123/trunk/python_24@5580',
+    gclient_scm.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 = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
@@ skipping 55 matching lines @@
         ).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)
-    gclient_scm.create_scm(self.url, self.root_dir, name).AndReturn(
-        gclient_scm.create_scm)
-    gclient_scm.create_scm.RunCommand('update', options, self.args, [])
+    gclient_scm.SCMWrapper(self.url, self.root_dir, name).AndReturn(
+        gclient_scm.SCMWrapper)
+    gclient_scm.SCMWrapper.RunCommand('update', options, self.args, [])
 
-    gclient_scm.create_scm(self.url, self.root_dir,
+    gclient_scm.SCMWrapper(self.url, self.root_dir,
                        None).AndReturn(scm_wrapper_src)
     scm_wrapper_src.FullUrlForRelativeUrl('/trunk/bar/WebKit'
         ).AndReturn(webkit_path)
 
-    gclient_scm.create_scm(webkit_path, self.root_dir,
-        'foo/third_party/WebKit').AndReturn(gclient_scm.create_scm)
-    gclient_scm.create_scm.RunCommand('update', options, self.args, [])
+    gclient_scm.SCMWrapper(webkit_path, self.root_dir,
+        'foo/third_party/WebKit').AndReturn(gclient_scm.SCMWrapper)
+    gclient_scm.SCMWrapper.RunCommand('update', options, self.args, [])
 
     self.mox.ReplayAll()
     client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
 
   def testRunOnDepsSuccessCustomVars(self):
     # Fake .gclient file.
     name = 'testRunOnDepsSuccessCustomVars_solution_name'
     gclient_config = """solutions = [ {
@@ skipping 24 matching lines @@
     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)
-    gclient_scm.create_scm(self.url, self.root_dir, name).AndReturn(
-        gclient_scm.create_scm)
-    gclient_scm.create_scm.RunCommand('update', options, self.args, [])
+    gclient_scm.SCMWrapper(self.url, self.root_dir, name).AndReturn(
+        gclient_scm.SCMWrapper)
+    gclient_scm.SCMWrapper.RunCommand('update', options, self.args, [])
 
-    gclient_scm.create_scm(self.url, self.root_dir,
+    gclient_scm.SCMWrapper(self.url, self.root_dir,
                        None).AndReturn(scm_wrapper_src)
     scm_wrapper_src.FullUrlForRelativeUrl('/trunk/bar_custom/WebKit'
         ).AndReturn(webkit_path)
 
-    gclient_scm.create_scm(webkit_path, self.root_dir,
-        'foo/third_party/WebKit').AndReturn(gclient_scm.create_scm)
-    gclient_scm.create_scm.RunCommand('update', options, self.args, [])
+    gclient_scm.SCMWrapper(webkit_path, self.root_dir,
+        'foo/third_party/WebKit').AndReturn(gclient_scm.SCMWrapper)
+    gclient_scm.SCMWrapper.RunCommand('update', options, self.args, [])
 
     self.mox.ReplayAll()
     client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
 
   def testRunOnDepsFailureVars(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',
 }"""
 
     options = self.Options()
     gclient.FileRead(os.path.join(self.root_dir, name, options.deps_file)
         ).AndReturn(deps_content)
-    gclient_scm.create_scm(self.url, self.root_dir, name).AndReturn(
-        gclient_scm.create_scm)
-    gclient_scm.create_scm.RunCommand('update', options, self.args, [])
+    gclient_scm.SCMWrapper(self.url, self.root_dir, name).AndReturn(
+        gclient_scm.SCMWrapper)
+    gclient_scm.SCMWrapper.RunCommand('update', options, self.args, [])
 
     self.mox.ReplayAll()
     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:
@@ skipping 54 matching lines @@
   def setUp(self):
     GClientBaseTestCase.setUp(self)
     self.root_dir = self.Dir()
     self.args = self.Args()
     self.url = self.Url()
     self.relpath = 'asf'
 
   def testDir(self):
     members = [
       'FullUrlForRelativeUrl', 'RunCommand', 'cleanup', 'diff', 'export',
-      'pack', 'relpath', 'revert', 'runhooks', 'scm_name', 'status',
-      'update', 'url',
+      'pack', 'relpath', 'revert', 'scm_name', 'status', 'update', 'url',
     ]
 
     # If you add a member, be sure to add the relevant test!
-    self.compareMembers(self._scm_wrapper(self.url,
-                                          self.root_dir,
-                                          self.relpath),
-                        members)
-
-  def testUnsupportedSCM(self):
-    args = [self.url, self.root_dir, self.relpath]
-    kwargs = {'scm_name' : 'foo'}
-    exception_msg = 'Unsupported scm %(scm_name)s' % kwargs
-    self.assertRaisesError(exception_msg, self._scm_wrapper, *args, **kwargs)
+    self.compareMembers(self._scm_wrapper(), members)
 
   def testFullUrlForRelativeUrl(self):
     self.url = 'svn://a/b/c/d'
 
     self.mox.ReplayAll()
-    scm = self._scm_wrapper(self.url, self.root_dir, 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')
 
   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 = self._scm_wrapper(self.url, self.root_dir, 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, scm.RunCommand,
-                           'update', options, self.args)
+    self.assertRaisesError(exception, self._scm_wrapper.RunCommand,
+                           scm, 'update', options, self.args)
 
   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_scm.RunSVNAndGetFileList(['checkout', self.url, base_path],
                                  self.root_dir, files_list)
 
     self.mox.ReplayAll()
-    scm = self._scm_wrapper(self.url, self.root_dir, self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     scm.revert(options, self.args, files_list)
 
   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_scm.CaptureSVNStatus(base_path).AndReturn([])
 
     self.mox.ReplayAll()
-    scm = self._scm_wrapper(self.url, self.root_dir, 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)
 
   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_scm.CaptureSVNStatus(base_path).AndReturn(items)
 
     print(os.path.join(base_path, 'a'))
     print(os.path.join(base_path, 'b'))
     gclient_scm.RunSVN(['revert', 'a', 'b'], base_path)
 
     self.mox.ReplayAll()
-    scm = self._scm_wrapper(self.url, self.root_dir, 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.assertEquals(sorted(file_list), sorted([os.path.join(base_path, 'a'),
                                                  os.path.join(base_path, 'b')]))
 
   def testRevertUnversionedUnexpectedFile(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 = [
@@ skipping 15 matching lines @@
     #self.assertEquals(file_list, [os.path.join(base_path, 'a')])
 
   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_scm.RunSVNAndGetFileList(['status'] + self.args, base_path,
                                  []).AndReturn(None)
 
     self.mox.ReplayAll()
-    scm = self._scm_wrapper(self.url, self.root_dir, 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)
 
 
   # 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_utils.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_scm.RunSVNAndGetFileList(['checkout', self.url, base_path],
                                  self.root_dir, files_list)
     self.mox.ReplayAll()
-    scm = self._scm_wrapper(self.url, self.root_dir, self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     scm.update(options, (), files_list)
 
   def testUpdateUpdate(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     options.force = True
     options.nohooks = False
     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_scm.CaptureSVNInfo(os.path.join(base_path, "."), '.'
         ).AndReturn(file_info)
     # Cheat a bit here.
     gclient_scm.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_scm.RunSVNAndGetFileList(['update', base_path] + additional_args,
                                  self.root_dir, files_list)
 
     self.mox.ReplayAll()
-    scm = self._scm_wrapper(self.url, self.root_dir, self.relpath)
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
     scm.update(options, (), files_list)
 
   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 = self._scm_wrapper(self.url, self.root_dir, 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)
 
   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>
 <wc-info>
@@ skipping 178 matching lines @@
 """
     gclient_scm.CaptureSVN = CaptureSVNMock
     info = gclient_scm.CaptureSVNStatus(None)
     self.assertEquals(info, [])
 
 
 if __name__ == '__main__':
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: