Propagate use_relative_paths into recursedeps

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 202 matching lines @@
         items.append(self.processed.get_nowait())
     except Queue.Empty:
       pass
     return items
 
   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)
+        None, '', True, False)
     self.assertEquals('proto://host/path@revision', d.url)
 
   def testStr(self):
     parser = gclient.OptionParser()
     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),
-        ],
-        [])
+      [
+        gclient.Dependency(
+          obj, 'foo', 'url', None, None, None, None, None, 'DEPS', True, False),
+        gclient.Dependency(
+          obj, 'bar', 'url', None, None, None, None, None, 'DEPS', True, False),
+      ],
+      [])
     obj.dependencies[0].add_dependencies_and_close(
-        [
-          gclient.Dependency(
-            obj.dependencies[0], 'foo/dir1', 'url', None, None, None, None,
-            None, 'DEPS', True),
-          gclient.Dependency(
-            obj.dependencies[0], 'foo/dir2',
-            gclient.GClientKeywords.FromImpl('bar'), None, None, None, None,
-            None, 'DEPS', True),
-          gclient.Dependency(
-            obj.dependencies[0], 'foo/dir3',
-            gclient.GClientKeywords.FileImpl('url'), None, None, None, None,
-            None, 'DEPS', True),
-        ],
-        [])
+      [
+        gclient.Dependency(
+          obj.dependencies[0], 'foo/dir1', 'url', None, None, None, None,
+          None, 'DEPS', True, False),
+        gclient.Dependency(
+          obj.dependencies[0], 'foo/dir2',
+          gclient.GClientKeywords.FromImpl('bar'), None, None, None, None,
+          None, 'DEPS', True, False),
+        gclient.Dependency(
+          obj.dependencies[0], 'foo/dir3',
+          gclient.GClientKeywords.FileImpl('url'), None, None, None, None,
+          None, 'DEPS', True, False),
+      ],
+      [])
     # Make sure __str__() works fine.
     # pylint: disable=W0212
     obj.dependencies[0]._file_list.append('foo')
     str_obj = str(obj)
     self.assertEquals(471, len(str_obj), '%d\n%s' % (len(str_obj), str_obj))
 
   def testHooks(self):
     topdir = self.root_dir
     gclient_fn = os.path.join(topdir, '.gclient')
     fh = open(gclient_fn, 'w')
@@ skipping 297 matching lines @@
       orig_deps = copy.deepcopy(deps)
       result = gclient.Dependency.MergeWithOsDeps(deps, deps_os, target_os_list)
       self.assertEqual(result, expected_deps)
       self.assertEqual(deps, orig_deps)
 
 
   def testLateOverride(self):
     """Verifies expected behavior of LateOverride."""
     url = "git@github.com:dart-lang/spark.git"
     d = gclient.Dependency(None, 'name', 'url',
-                           None, None, None, None, None, '', True)
+                           None, None, None, None, None, '', True, False)
     late_url = d.LateOverride(url)
     self.assertEquals(url, late_url)
 
   def testDepsOsOverrideDepsInDepsFile(self):
     """Verifies that a 'deps_os' path can override a 'deps' path. Also
     see testUpdateWithOsDeps above.
     """
 
     write(
         '.gclient',
@@ skipping 151 matching lines @@
         '  { "name": "foo", "url": "svn://example.com/foo" },\n'
           ']')
     write(
         os.path.join('foo', 'DEPS'),
         'use_relative_paths = True\n'
         'deps = {\n'
         '  "bar": "/bar",\n'
         '}\n'
         'recursedeps = ["bar"]')
     write(
-        os.path.join('bar', 'DEPS'),
+        os.path.join('foo/bar', 'DEPS'),
         'deps = {\n'
         '  "baz": "/baz",\n'
         '}')
+    write(
+        os.path.join('baz', 'DEPS'),
+        'deps = {\n'
+        '  "fizz": "/fizz",\n'
+        '}')
+
+    options, _ = gclient.OptionParser().parse_args([])
+    obj = gclient.GClient.LoadCurrentConfig(options)
+    obj.RunOnDeps('None', [])
+    self.assertEquals(
+        [
+          ('foo', 'svn://example.com/foo'),
+          ('foo/bar', 'svn://example.com/foo/bar'),
+          ('foo/baz', 'svn://example.com/foo/bar/baz'),
+        ],
+        self._get_processed())
+
+  def testRelativeRecursion(self):
+    """Verifies that nested use_relative_paths is always respected."""
+    write(
+        '.gclient',
+        'solutions = [\n'
+        '  { "name": "foo", "url": "svn://example.com/foo" },\n'
+          ']')
+    write(
+        os.path.join('foo', 'DEPS'),
+        'use_relative_paths = True\n'
+        'deps = {\n'
+        '  "bar": "/bar",\n'
+        '}\n'
+        'recursedeps = ["bar"]')
+    write(
+        os.path.join('foo/bar', 'DEPS'),
+        'use_relative_paths = True\n'
+        'deps = {\n'
+        '  "baz": "/baz",\n'
+        '}')
     write(
         os.path.join('baz', 'DEPS'),
         'deps = {\n'
         '  "fizz": "/fizz",\n'
         '}')
 
     options, _ = gclient.OptionParser().parse_args([])
     obj = gclient.GClient.LoadCurrentConfig(options)
     obj.RunOnDeps('None', [])
     self.assertEquals(
         [
           ('foo', 'svn://example.com/foo'),
           ('foo/bar', 'svn://example.com/foo/bar'),
-          # TODO(agable): Figure out why baz isn't included here. The
-          # recursedeps = ["bar"] in foo's DEPS means that we should be
-          # fetching the entries in bar's DEPS file, which includes baz.
+          ('foo/bar/baz', 'svn://example.com/foo/bar/baz'),
         ],
         self._get_processed())
 
   def testRecursionOverridesRecursedeps(self):
     """Verifies gclient respects |recursion| over |recursedeps|.
 
     |recursion| is set in a top-level DEPS file.  That value is meant
     to affect how many subdeps are parsed via recursion.
 
     |recursedeps| is set in each DEPS file to control whether or not
@@ skipping 298 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()