Fix the case where a dep not processed could be set as a requirement.

tests/gclient_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 70 matching lines @@
 
   def testDependenciesJobsReverse(self):
     self._dependencies('1000', True)
 
   def _dependencies(self, jobs, reverse):
     # Verify 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.
     # jobs is the number of parallel jobs simulated. reverse is to reshuffle the
     # list to see if it is still processed in order correctly.
+    # Also test that a From() dependency that should not be processed is listed
+    # as a requirement.
     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'),
         'deps = {\n'
         '  "foo/dir1": "/dir1",\n'
+        # This one will depend on dir1/dir2 in bar.
         '  "foo/dir1/dir2/dir3": "/dir1/dir2/dir3",\n'
-        '  "foo/dir1/dir4": "/dir1/dir4",\n'
         '  "foo/dir1/dir2/dir3/dir4": "/dir1/dir2/dir3/dir4",\n'
+        '  "foo/dir1/dir2/dir5/dir6":\n'
+        '    From("foo/dir1/dir2/dir3/dir4", "foo/dir1/dir2"),\n'
         '}')
     write(
         os.path.join('bar', 'DEPS'),
         'deps = {\n'
         '  "foo/dir1/dir2": "/dir1/dir2",\n'
         '}')
     write(
         os.path.join('bar/empty', 'DEPS'),
         'deps = {\n'
         '}')
+    # Test From()
+    write(
+        os.path.join('foo/dir1/dir2/dir3/dir4', 'DEPS'),
+        'deps = {\n'
+        # This one should not be fetched or set as a requirement.
+        '  "foo/dir1/dir2/dir5": "svn://example.com/x",\n'
+        '  "foo/dir1/dir2": "/dir1/another",\n'
+        '}')
 
     obj = gclient.GClient.LoadCurrentConfig(options)
     self._check_requirements(obj.dependencies[0], {})
     self._check_requirements(obj.dependencies[1], {})
     obj.RunOnDeps('None', args)
     # The trick here is to manually process the list to make sure it's out of
     # order.
     for i in obj.dependencies:
       i.dependencies.sort(key=lambda x: x.name, reverse=reverse)
     actual = self._get_processed()
     # We don't care of the ordering of these items:
     self.assertEquals(
         ['svn://example.com/bar', 'svn://example.com/foo'], sorted(actual[0:2]))
     actual = actual[2:]
     # Ordering may not be exact in case of parallel jobs.
     self.assertTrue(
         actual.index('svn://example.com/bar/dir1/dir2') >
         actual.index('svn://example.com/foo/dir1'))
     actual.remove('svn://example.com/bar/dir1/dir2')
 
     # Ordering may not be exact in case of parallel jobs.
     actual.remove('svn://example.com/bar_empty')
     self.assertEquals(
         [
           'svn://example.com/foo/dir1',
-          'svn://example.com/foo/dir1/dir4',
           'svn://example.com/foo/dir1/dir2/dir3',
           'svn://example.com/foo/dir1/dir2/dir3/dir4',
+          # TODO(maruel): This is probably wrong.
+          'svn://example.com/foo/dir1/dir2/dir3/dir4/dir1/another',
         ],
         actual)
     self._check_requirements(
         obj.dependencies[0],
         {
           'foo/dir1': ['foo'],
           'foo/dir1/dir2/dir3': ['foo', 'foo/dir1', 'foo/dir1/dir2'],
           'foo/dir1/dir2/dir3/dir4':
               ['foo', 'foo/dir1', 'foo/dir1/dir2', 'foo/dir1/dir2/dir3'],
-          'foo/dir1/dir4': ['foo', 'foo/dir1'],
+          'foo/dir1/dir2/dir5/dir6':
+              ['foo', 'foo/dir1', 'foo/dir1/dir2', 'foo/dir1/dir2/dir3/dir4'],
         })
     self._check_requirements(
         obj.dependencies[1],
         {
           'foo/dir1/dir2': ['bar', 'foo', 'foo/dir1'],
         })
     self._check_requirements(
         obj,
         {
           'foo': [],
@@ skipping 24 matching lines @@
         None, '', True)
     self.assertEquals('proto://host/path@revision', d.url)
 
 if __name__ == '__main__':
   logging.basicConfig(
       level=[logging.ERROR, logging.WARNING, logging.INFO, logging.DEBUG][
         min(sys.argv.count('-v'), 3)],
       format='%(asctime).19s %(levelname)s %(filename)s:'
               '%(lineno)s %(message)s')
   unittest.main()