Add ability to override DEPS file in 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 829 matching lines @@
           # Deps after this would have been skipped if we were obeying
           # |recursedeps|.
           'svn://example.com/foo/bar/baz',
           'svn://example.com/foo/bar/baz/fizz',
           # And this dep would have been picked up if we were obeying
           # |recursedeps|.
           # 'svn://example.com/foo/bar/baz/fuzz',
         ],
         self._get_processed())
 
+  def testRecursedepsAltfile(self):
+    """Verifies gclient respects the |recursedeps| var syntax with overridden
+    target DEPS file.
+
+    This is what we mean to check here:
+    - Naming an alternate DEPS file in recursedeps pulls from that one.
+    """
+    write(
+        '.gclient',
+        'solutions = [\n'
+        '  { "name": "foo", "url": "svn://example.com/foo" },\n'
+        ']')
+    write(
+        os.path.join('foo', 'DEPS'),
+        'deps = {\n'
+        '  "bar": "/bar",\n'
+        '}\n'
+        'recursedeps = [("bar", "DEPS.alt")]')
+    write(os.path.join('bar', 'DEPS'), 'ERROR ERROR ERROR')

[iannucci, 2016/04/27 01:21:55]

This test would fail before this change, because it would recurse into bar using
this DEPS error. I've confirmed that this test fails in that condition (with a
SyntaxError during the test execution, as you would expect)

+    write(
+        os.path.join('bar', 'DEPS.alt'),
+        'deps = {\n'
+        '  "baz": "/baz",\n'
+        '}')
+
+    options, _ = gclient.OptionParser().parse_args([])
+    obj = gclient.GClient.LoadCurrentConfig(options)
+    obj.RunOnDeps('None', [])
+    self.assertEquals(
+        [
+          'svn://example.com/foo',
+          'svn://example.com/foo/bar',
+          'svn://example.com/foo/bar/baz',
+        ],
+        self._get_processed())
+
   def testGitDeps(self):
     """Verifies gclient respects a .DEPS.git deps file.
 
     Along the way, we also test that if both DEPS and .DEPS.git are present,
     that gclient does not read the DEPS file.  This will reliably catch bugs
     where gclient is always hitting the wrong file (DEPS).
     """
     write(
         '.gclient',
         'solutions = [\n'
@@ skipping 170 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()