Improve the test.

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 303 matching lines @@
     The target_os variable in a DEPS file allows specifying the name of an
     additional OS which should be considered when selecting dependencies from a
     DEPS' deps_os. The value will be appended to the _enforced_os tuple.
     """
 
     write(
         '.gclient',
         'solutions = [\n'
         '  { "name": "foo",\n'
         '    "url": "svn://example.com/foo",\n'
+        '  },\n'
+        '  { "name": "bar",\n'
+        '    "url": "svn://example.com/bar",\n'
         '  }]\n')
     write(
         os.path.join('foo', 'DEPS'),
         'target_os = ["baz"]\n'
         'deps_os = {\n'
         '  "unix": { "foo/unix": "/unix", },\n'
         '  "baz": { "foo/baz": "/baz", },\n'
         '  "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.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',
           'svn://example.com/foo',
           'svn://example.com/foo/baz',
           'svn://example.com/foo/unix',
           ],
         sorted(self._get_processed()))
 
   def testRecursionOverride(self):
     """Verifies gclient respects the recursion var syntax.
 
     We check several things here:
@@ skipping 48 matching lines @@
   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()