Simplify a bit the gclient unit test

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 116 matching lines @@
     gclient.GClient.SetDefaultConfig('the_name', 'http://svn/url/the_name',
                                      'other')
     gclient.GClient.SaveConfig()
 
     self.mox.ReplayAll()
     gclient.CMDconfig(None, options,
                       ('http://svn/url/the_name', 'other', 'args', 'ignored'))
 
 
 class GenericCommandTestCase(GclientTestCase):
-  def ReturnValue(self, command, function, return_value):
+  def ReturnValue(self, command, return_value):
     options = self.Options()
     gclient.GClient.LoadCurrentConfig(options).AndReturn(gclient.GClient)
     gclient.GClient.RunOnDeps(command, self.args).AndReturn(return_value)
 
     self.mox.ReplayAll()
+    function = getattr(gclient, 'CMD' + command)
     result = function(None, options, self.args)
     self.assertEquals(result, return_value)
 
-  def BadClient(self, function):
+  def BadClient(self, command):
     options = self.Options()
     gclient.GClient.LoadCurrentConfig(options).AndReturn(None)
 
     self.mox.ReplayAll()
+    function = getattr(gclient, 'CMD' + command)
     self.assertRaisesError(
         "client not configured; see 'gclient config'",
         function, None, options, self.args)
 
-  def Verbose(self, command, function):
+  def Verbose(self, command):
     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()
+    function = getattr(gclient, 'CMD' + command)
     result = function(None, options, self.args)
     self.assertEquals(result, 0)
 
 
 class TestCMDcleanup(GenericCommandTestCase):
   def testGoodClient(self):
-    self.ReturnValue('cleanup', gclient.CMDcleanup, 0)
+    self.ReturnValue('cleanup', 0)
   def testError(self):
-    self.ReturnValue('cleanup', gclient.CMDcleanup, 42)
+    self.ReturnValue('cleanup', 42)
   def testBadClient(self):
-    self.BadClient(gclient.CMDcleanup)
+    self.BadClient('cleanup')
 
 
 class TestCMDstatus(GenericCommandTestCase):
   def testGoodClient(self):
-    self.ReturnValue('status', gclient.CMDstatus, 0)
+    self.ReturnValue('status', 0)
   def testError(self):
-    self.ReturnValue('status', gclient.CMDstatus, 42)
+    self.ReturnValue('status', 42)
   def testBadClient(self):
-    self.BadClient(gclient.CMDstatus)
+    self.BadClient('status')
 
 
 class TestCMDrunhooks(GenericCommandTestCase):
   def Options(self, verbose=False, *args, **kwargs):
     return self.OptionsObject(self, verbose=verbose, *args, **kwargs)
 
   def testGoodClient(self):
-    self.ReturnValue('runhooks', gclient.CMDrunhooks, 0)
+    self.ReturnValue('runhooks', 0)
   def testError(self):
-    self.ReturnValue('runhooks', gclient.CMDrunhooks, 42)
+    self.ReturnValue('runhooks', 42)
   def testBadClient(self):
-    self.BadClient(gclient.CMDrunhooks)
+    self.BadClient('runhooks')
 
 
 class TestCMDupdate(GenericCommandTestCase):
-  def ReturnValue(self, command, function, return_value):
+  def ReturnValue(self, command, 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()
+    function = getattr(gclient, 'CMD' + command)
     result = function(None, options, self.args)
     self.assertEquals(result, return_value)
 
-  def Verbose(self, command, function):
+  def Verbose(self, command):
     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()
+    function = getattr(gclient, 'CMD' + command)
     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)
+    self.ReturnValue('update', 0)
   def testError(self):
-    self.ReturnValue('update', gclient.CMDupdate, 42)
+    self.ReturnValue('update', 42)
   def testBadClient(self):
-    self.BadClient(gclient.CMDupdate)
+    self.BadClient('update')
   def testVerbose(self):
-    self.Verbose('update', gclient.CMDupdate)
+    self.Verbose('update')
 
 
 class TestCMDdiff(GenericCommandTestCase):
   def Options(self, *args, **kwargs):
       return self.OptionsObject(self, *args, **kwargs)
 
   def testBasic(self):
-    self.ReturnValue('diff', gclient.CMDdiff, 0)
+    self.ReturnValue('diff', 0)
   def testError(self):
-    self.ReturnValue('diff', gclient.CMDdiff, 42)
+    self.ReturnValue('diff', 42)
   def testBadClient(self):
-    self.BadClient(gclient.CMDdiff)
+    self.BadClient('diff')
   def testVerbose(self):
-    self.Verbose('diff', gclient.CMDdiff)
+    self.Verbose('diff')
 
 
 class TestCMDexport(GenericCommandTestCase):
   def testBasic(self):
     self.args = ['dir']
-    self.ReturnValue('export', gclient.CMDexport, 0)
+    self.ReturnValue('export', 0)
   def testError(self):
     self.args = ['dir']
-    self.ReturnValue('export', gclient.CMDexport, 42)
+    self.ReturnValue('export', 42)
   def testBadClient(self):
     self.args = ['dir']
-    self.BadClient(gclient.CMDexport)
+    self.BadClient('export')
 
 
 class TestCMDpack(GenericCommandTestCase):
   def Options(self, *args, **kwargs):
       return self.OptionsObject(self, *args, **kwargs)
 
   def testBasic(self):
-    self.ReturnValue('pack', gclient.CMDpack, 0)
+    self.ReturnValue('pack', 0)
   def testError(self):
-    self.ReturnValue('pack', gclient.CMDpack, 42)
+    self.ReturnValue('pack', 42)
   def testBadClient(self):
-    self.BadClient(gclient.CMDpack)
+    self.BadClient('pack')
 
 
 class TestCMDrevert(GenericCommandTestCase):
   def testBasic(self):
-    self.ReturnValue('revert', gclient.CMDrevert, 0)
+    self.ReturnValue('revert', 0)
   def testError(self):
-    self.ReturnValue('revert', gclient.CMDrevert, 42)
+    self.ReturnValue('revert', 42)
   def testBadClient(self):
-    self.BadClient(gclient.CMDrevert)
+    self.BadClient('revert')
 
 
 class GClientClassTestCase(GclientTestCase):
   def testDir(self):
     members = [
       'ConfigContent', 'DEFAULT_CLIENT_FILE_TEXT',
       'DEFAULT_SNAPSHOT_FILE_TEXT', 'DEFAULT_SNAPSHOT_SOLUTION_TEXT',
       'DEPS_FILE', 'FileImpl', 'FromImpl', 'GetVar', 'LoadCurrentConfig',
       'PrintRevInfo', 'RunOnDeps', 'SaveConfig', 'SetConfig',
       'SetDefaultConfig',
@@ skipping 969 matching lines @@
     pass
   def test_VarImpl(self):
     pass
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: