Revert "Improve description layout. Improve coloring and add legend in help."

tests/gclient_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 See gclient_smoketest.py for integration tests.
 """
 
@@ skipping 68 matching lines @@
     """Verifies that dependencies are processed in the right order.
 
     e.g. if there is a dependency 'src' and another 'src/third_party/bar', that
     bar isn't fetched until 'src' is done.
     Also test that a From() dependency should not be processed when it is listed
     as a requirement.
 
     Args:
       |jobs| is the number of parallel jobs simulated.
     """
-    parser = gclient.OptionParser()
+    parser = gclient.Parser()
     options, args = parser.parse_args(['--jobs', jobs])
     write(
         '.gclient',
         'solutions = [\n'
         '  { "name": "foo", "url": "svn://example.com/foo" },\n'
         '  { "name": "bar", "url": "svn://example.com/bar" },\n'
         '  { "name": "bar/empty", "url": "svn://example.com/bar_empty" },\n'
         ']')
     write(
         os.path.join('foo', 'DEPS'),
@@ skipping 106 matching lines @@
 
   def testAutofix(self):
     # Invalid urls causes pain when specifying requirements. Make sure it's
     # auto-fixed.
     d = gclient.Dependency(
         None, 'name', 'proto://host/path/@revision', None, None, None, None,
         None, '', True)
     self.assertEquals('proto://host/path@revision', d.url)
 
   def testStr(self):
-    parser = gclient.OptionParser()
+    parser = gclient.Parser()
     options, _ = parser.parse_args([])
     obj = gclient.GClient('foo', options)
     obj.add_dependencies_and_close(
         [
           gclient.Dependency(
             obj, 'foo', 'url', None, None, None, None, None, 'DEPS', True),
           gclient.Dependency(
             obj, 'bar', 'url', None, None, None, None, None, 'DEPS', True),
         ],
         [])
@@ skipping 31 matching lines @@
     hooks = [{'pattern':'.', 'action':['cmd1', 'arg1', 'arg2']}]
     print >> fh, 'hooks = %s' % repr(hooks)
     fh.close()
 
     fh = open(os.path.join(subdir_fn, 'fake.txt'), 'w')
     print >> fh, 'bogus content'
     fh.close()
 
     os.chdir(topdir)
 
-    parser = gclient.OptionParser()
+    parser = gclient.Parser()
     options, _ = parser.parse_args([])
     options.force = True
     client = gclient.GClient.LoadCurrentConfig(options)
     work_queue = gclient_utils.ExecutionQueue(options.jobs, None, False)
     for s in client.dependencies:
       work_queue.enqueue(s)
     work_queue.flush({}, None, [], options=options)
     self.assertEqual(client.GetHooks(options), [x['action'] for x in hooks])
 
   def testCustomHooks(self):
@@ skipping 28 matching lines @@
         {'name': 'skip', 'pattern':'.', 'action':['response2', 'yes', 'sir']})
     print >> fh, 'hooks = %s' % repr(sub_hooks)
     fh.close()
 
     fh = open(os.path.join(subdir_fn, 'fake.txt'), 'w')
     print >> fh, 'bogus content'
     fh.close()
 
     os.chdir(topdir)
 
-    parser = gclient.OptionParser()
+    parser = gclient.Parser()
     options, _ = parser.parse_args([])
     options.force = True
     client = gclient.GClient.LoadCurrentConfig(options)
     work_queue = gclient_utils.ExecutionQueue(options.jobs, None, False)
     for s in client.dependencies:
       work_queue.enqueue(s)
     work_queue.flush({}, None, [], options=options)
     self.assertEqual(client.GetHooks(options),
                      [x['action'] for x in hooks + extra_hooks + sub_hooks])
 
@@ skipping 15 matching lines @@
     write(
         os.path.join('foo', 'DEPS'),
         'deps = {\n'
         '  "foo/dir1": "/dir1",'
         '}\n'
         'deps_os = {\n'
         '  "unix": { "foo/dir2": "/dir2", },\n'
         '  "baz": { "foo/dir3": "/dir3", },\n'
         '}')
 
-    parser = gclient.OptionParser()
+    parser = gclient.Parser()
     options, _ = parser.parse_args(['--jobs', '1'])
     options.deps_os = "unix"
 
     obj = gclient.GClient.LoadCurrentConfig(options)
     self.assertEqual(['baz', 'unix'], sorted(obj.enforced_os))
 
   def testTargetOsWithTargetOsOnly(self):
     """Verifies that specifying a target_os and target_os_only pulls in only
     the relevant dependencies.
 
@@ skipping 14 matching lines @@
     write(
         os.path.join('foo', 'DEPS'),
         'deps = {\n'
         '  "foo/dir1": "/dir1",'
         '}\n'
         'deps_os = {\n'
         '  "unix": { "foo/dir2": "/dir2", },\n'
         '  "baz": { "foo/dir3": "/dir3", },\n'
         '}')
 
-    parser = gclient.OptionParser()
+    parser = gclient.Parser()
     options, _ = parser.parse_args(['--jobs', '1'])
     options.deps_os = "unix"
 
     obj = gclient.GClient.LoadCurrentConfig(options)
     self.assertEqual(['baz'], sorted(obj.enforced_os))
 
   def testTargetOsOnlyWithoutTargetOs(self):
     """Verifies that specifying a target_os_only without target_os_only raises
     an exception.
     """
 
     write(
         '.gclient',
         'solutions = [\n'
         '  { "name": "foo",\n'
         '    "url": "svn://example.com/foo",\n'
         '  }]\n'
         'target_os_only = True')
     write(
         os.path.join('foo', 'DEPS'),
         'deps = {\n'
         '  "foo/dir1": "/dir1",'
         '}\n'
         'deps_os = {\n'
         '  "unix": { "foo/dir2": "/dir2", },\n'
         '}')
 
-    parser = gclient.OptionParser()
+    parser = gclient.Parser()
     options, _ = parser.parse_args(['--jobs', '1'])
     options.deps_os = "unix"
 
     exception_raised = False
     try:
       gclient.GClient.LoadCurrentConfig(options)
     except gclient_utils.Error:
       exception_raised = True
     self.assertTrue(exception_raised)
 
@@ skipping 24 matching lines @@
         '  "jaz": { "foo/jaz": "/jaz", },\n'
         '}')
     write(
         os.path.join('bar', 'DEPS'),
         'deps_os = {\n'
         '  "unix": { "bar/unix": "/unix", },\n'
         '  "baz": { "bar/baz": "/baz", },\n'
         '  "jaz": { "bar/jaz": "/jaz", },\n'
         '}')
 
-    parser = gclient.OptionParser()
+    parser = gclient.Parser()
     options, _ = parser.parse_args(['--jobs', '1'])
     options.deps_os = 'unix'
 
     obj = gclient.GClient.LoadCurrentConfig(options)
     obj.RunOnDeps('None', [])
     self.assertEqual(['unix'], sorted(obj.enforced_os))
     self.assertEquals(
         [
           'svn://example.com/bar',
           'svn://example.com/bar/unix',
@@ skipping 20 matching lines @@
         '  "foo/src": "/src",\n' # This path is to be overridden by similar path
                                  # in deps_os['unix'].
         '}\n'
         'deps_os = {\n'
         '  "unix": { "foo/unix": "/unix",'
         '            "foo/src": "/src_unix"},\n'
         '  "baz": { "foo/baz": "/baz", },\n'
         '  "jaz": { "foo/jaz": "/jaz", },\n'
         '}')
 
-    parser = gclient.OptionParser()
+    parser = gclient.Parser()
     options, _ = parser.parse_args(['--jobs', '1'])
     options.deps_os = 'unix'
 
     obj = gclient.GClient.LoadCurrentConfig(options)
     obj.RunOnDeps('None', [])
     self.assertEqual(['unix'], sorted(obj.enforced_os))
     self.assertEquals(
         [
           'svn://example.com/foo',
           'svn://example.com/foo/baz',
@@ skipping 32 matching lines @@
         os.path.join('baz', 'DEPS'),
         'deps = {\n'
         '  "fizz": "/fizz",\n'
         '}')
     write(
         os.path.join('fizz', 'DEPS'),
         'deps = {\n'
         '  "fuzz": "/fuzz",\n'
         '}')
 
-    options, _ = gclient.OptionParser().parse_args([])
+    options, _ = gclient.Parser().parse_args([])
     obj = gclient.GClient.LoadCurrentConfig(options)
     obj.RunOnDeps('None', [])
     self.assertEquals(
         [
           'svn://example.com/foo',
           'svn://example.com/bar',
           'svn://example.com/foo/bar',
           'svn://example.com/foo/bar/baz',
           'svn://example.com/foo/bar/baz/fizz',
         ],
         self._get_processed())
 
 
 if __name__ == '__main__':
   sys.stdout = gclient_utils.MakeFileAutoFlush(sys.stdout)
   sys.stdout = gclient_utils.MakeFileAnnotated(sys.stdout, include_zero=True)
   sys.stderr = gclient_utils.MakeFileAutoFlush(sys.stderr)
   sys.stderr = gclient_utils.MakeFileAnnotated(sys.stderr, include_zero=True)
   logging.basicConfig(
       level=[logging.ERROR, logging.WARNING, logging.INFO, logging.DEBUG][
         min(sys.argv.count('-v'), 3)],
       format='%(relativeCreated)4d %(levelname)5s %(module)13s('
               '%(lineno)d) %(message)s')
   unittest.main()