Massive overhaul for gcl help

tests/gcl_unittest.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 gcl.py."""
 
 # Fixes include path.
 from super_mox import mox, SuperMoxTestBase
 
@@ skipping 18 matching lines @@
 class GclUnittest(GclTestsBase):
   """General gcl.py tests."""
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
         'CODEREVIEW_SETTINGS', 'CODEREVIEW_SETTINGS_FILE',
         'CMDchange', 'CMDchanges', 'CMDcommit', 'CMDdelete', 'CMDdeleteempties',
         'CMDdescription', 'CMDdiff', 'CMDhelp', 'CMDlint', 'CMDnothave',
         'CMDopened', 'CMDpassthru', 'CMDpresubmit', 'CMDrename', 'CMDsettings',
         'CMDstatus', 'CMDtry', 'CMDupload',
-        'ChangeInfo', 'DEFAULT_LINT_IGNORE_REGEX',
-        'DEFAULT_LINT_REGEX', 'CheckHomeForFile',
-        'DoPresubmitChecks', 'ErrorExit', 'FILES_CACHE', 'FilterFlag',
+        'ChangeInfo', 'Command', 'DEFAULT_LINT_IGNORE_REGEX',
+        'DEFAULT_LINT_REGEX', 'CheckHomeForFile', 'DoPresubmitChecks',
+        'ErrorExit', 'FILES_CACHE', 'FilterFlag', 'GenUsage',
         'GenerateChangeName', 'GenerateDiff', 'GetCLs', 'GetCacheDir',
         'GetCachedFile', 'GetChangelistInfoFile', 'GetChangesDir',
         'GetCodeReviewSetting', 'GetEditor', 'GetFilesNotInCL', 'GetInfoDir',
         'GetIssueDescription', 'GetModifiedFiles', 'GetRepositoryRoot',
         'ListFiles',
         'LoadChangelistInfoForMultiple', 'MISSING_TEST_MSG',
         'OptionallyDoPresubmitChecks', 'REPOSITORY_ROOT',
         'RunShell', 'RunShellWithReturnCode', 'SVN',
         'SendToRietveld', 'TryChange', 'UnknownFiles', 'Warn',
-        'breakpad', 'gclient_utils', 'getpass', 'main', 'need_change', 'os',
+        'attrs', 'breakpad', 'defer_attributes', 'gclient_utils', 'getpass',
+        'main', 'need_change', 'need_change_and_args', 'no_args', 'os',
         'random', 're', 'shutil', 'string', 'subprocess', 'sys', 'tempfile',
         'time', 'upload', 'urllib2',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gcl, members)
 
   def testIsSVNMoved(self):
     # TODO(maruel): TEST ME
     pass
 
@@ skipping 16 matching lines @@
     self.assertRaises(gcl.gclient_utils.Error, gcl.GetRepositoryRoot)
 
   def testGetRepositoryRootGood(self):
     root_path = gcl.os.path.join('bleh', 'prout', 'pouet')
     gcl.os.getcwd().AndReturn(root_path)
     gcl.SVN.GetCheckoutRoot(root_path).AndReturn(root_path + '.~')
     self.mox.ReplayAll()
     self.assertEquals(gcl.GetRepositoryRoot(), root_path + '.~')
 
   def testHelp(self):
-    gcl.sys.stdout.write(mox.StrContains('GCL is a wrapper for Subversion'))
-    gcl.sys.stdout.write('\n')
+    gcl.sys.stdout.write = lambda x: None
     self.mox.ReplayAll()
     gcl.CMDhelp([])
 
 
 class ChangeInfoUnittest(GclTestsBase):
   def setUp(self):
     GclTestsBase.setUp(self)
     self.mox.StubOutWithMock(gcl, 'GetChangelistInfoFile')
     self.mox.StubOutWithMock(gcl, 'GetRepositoryRoot')
 
@@ skipping 212 matching lines @@
     self.mox.ReplayAll()
 
     gcl.CMDupload(['naame', '--no_watchlists'])
     self.assertEquals(change_info.issue, 1)
     self.assertEquals(change_info.patchset, 2)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()