Goes further down the rabbit hole.

tests/gclient_test.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 gclient.py."""
 
 # Fixes include path.
 from super_mox import mox, SuperMoxTestBase
 
@@ skipping 79 matching lines @@
     for v in cmds:
       # If it fails, you need to add a test case for the new command.
       self.assert_(v in known_commands)
     self.mox.ReplayAll()
 
 class TestCMDconfig(GclientTestCase):
   def testMissingArgument(self):
     exception_msg = "required argument missing; see 'gclient help config'"
 
     self.mox.ReplayAll()
-    self.assertRaisesError(exception_msg, gclient.CMDconfig, self.Options(), ())
+    self.assertRaisesError(exception_msg, gclient.CMDconfig, None,
+                           self.Options(), ())
 
   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.CMDconfig, options, (1,))
+    self.assertRaisesError(exception_msg, gclient.CMDconfig, None, options,
+                           (1,))
 
   def testFromText(self):
     options = self.Options(spec='config_source_content')
     gclient.os.path.exists(options.config_filename).AndReturn(False)
     gclient.GClient('.', options).AndReturn(gclient.GClient)
     gclient.GClient.SetConfig(options.spec)
     gclient.GClient.SaveConfig()
 
     self.mox.ReplayAll()
-    gclient.CMDconfig(options, (1,),)
+    gclient.CMDconfig(None, options, (1,),)
 
   def testCreateClientFile(self):
     options = self.Options()
     gclient.os.path.exists(options.config_filename).AndReturn(False)
     gclient.GClient('.', options).AndReturn(gclient.GClient)
     gclient.GClient.SetDefaultConfig('the_name', 'http://svn/url/the_name',
                                      'other')
     gclient.GClient.SaveConfig()
 
     self.mox.ReplayAll()
-    gclient.CMDconfig(options,
+    gclient.CMDconfig(None, options,
                       ('http://svn/url/the_name', 'other', 'args', 'ignored'))
 
 
 class GenericCommandTestCase(GclientTestCase):
   def ReturnValue(self, command, function, return_value):
     options = self.Options()
     gclient.GClient.LoadCurrentConfig(options).AndReturn(gclient.GClient)
     gclient.GClient.RunOnDeps(command, self.args).AndReturn(return_value)
 
     self.mox.ReplayAll()
-    result = function(options, self.args)
+    result = function(None, options, self.args)
     self.assertEquals(result, return_value)
 
   def BadClient(self, function):
     options = self.Options()
     gclient.GClient.LoadCurrentConfig(options).AndReturn(None)
 
     self.mox.ReplayAll()
     self.assertRaisesError(
         "client not configured; see 'gclient config'",
-        function, options, self.args)
+        function, None, options, self.args)
 
   def Verbose(self, command, function):
     options = self.Options(verbose=True)
     gclient.GClient.LoadCurrentConfig(options).AndReturn(gclient.GClient)
     text = "# Dummy content\nclient = 'my client'"
     gclient.GClient.ConfigContent().AndReturn(text)
     print(text)
     gclient.GClient.RunOnDeps(command, self.args).AndReturn(0)
 
     self.mox.ReplayAll()
-    result = function(options, self.args)
+    result = function(None, options, self.args)
     self.assertEquals(result, 0)
 
 
 class TestCMDcleanup(GenericCommandTestCase):
   def testGoodClient(self):
     self.ReturnValue('cleanup', gclient.CMDcleanup, 0)
   def testError(self):
     self.ReturnValue('cleanup', gclient.CMDcleanup, 42)
   def testBadClient(self):
     self.BadClient(gclient.CMDcleanup)
@@ skipping 21 matching lines @@
 
 
 class TestCMDupdate(GenericCommandTestCase):
   def ReturnValue(self, command, function, return_value):
     options = self.Options()
     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)
+    result = function(None, options, self.args)
     self.assertEquals(result, return_value)
 
   def Verbose(self, command, function):
     options = self.Options(verbose=True)
     gclient.GClient.LoadCurrentConfig(options).AndReturn(gclient.GClient)
     gclient.GClient.GetVar("solutions")
     text = "# Dummy content\nclient = 'my client'"
     gclient.GClient.ConfigContent().AndReturn(text)
     print(text)
     gclient.GClient.RunOnDeps(command, self.args).AndReturn(0)
 
     self.mox.ReplayAll()
-    result = function(options, self.args)
+    result = function(None, options, self.args)
     self.assertEquals(result, 0)
 
   def Options(self, verbose=False, *args, **kwargs):
     return self.OptionsObject(self, verbose=verbose, *args, **kwargs)
 
   def testBasic(self):
     self.ReturnValue('update', gclient.CMDupdate, 0)
   def testError(self):
     self.ReturnValue('update', gclient.CMDupdate, 42)
   def testBadClient(self):
@@ skipping 1029 matching lines @@
     pass
   def test_VarImpl(self):
     pass
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: