Update gclient test to assert both dir and url

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 15 matching lines @@
   """Writes the content of a file and create the directories as needed."""
   filename = os.path.abspath(filename)
   dirname = os.path.dirname(filename)
   if not os.path.isdir(dirname):
     os.makedirs(dirname)
   with open(filename, 'w') as f:
     f.write(content)
 
 
 class SCMMock(object):
-  def __init__(self, unit_test, url):
+  def __init__(self, unit_test, name, url):
     self.unit_test = unit_test
+    self.name = name
     self.url = url
 
   def RunCommand(self, command, options, args, file_list):
     self.unit_test.assertEquals('None', command)
-    self.unit_test.processed.put(self.url)
+    self.unit_test.processed.put((self.name, self.url))
 
   def FullUrlForRelativeUrl(self, url):
     return self.url + url
 
   # pylint: disable=R0201
   def DoesRemoteURLMatch(self, _):
     return True
 
   def GetActualRemoteURL(self, _):
     return self.url
@@ skipping 15 matching lines @@
   def tearDown(self):
     self.assertEquals([], self._get_processed())
     gclient.gclient_scm.CreateSCM = self._old_createscm
     sys.stdout = self._old_sys_stdout
     os.chdir(self.previous_dir)
     super(GclientTest, self).tearDown()
 
   def _createscm(self, parsed_url, root_dir, name, out_fh=None, out_cb=None):
     self.assertTrue(parsed_url.startswith('svn://example.com/'), parsed_url)
     self.assertTrue(root_dir.startswith(self.root_dir), root_dir)
-    return SCMMock(self, parsed_url)
+    return SCMMock(self, name, parsed_url)
 
   def testDependencies(self):
     self._dependencies('1')
 
   def testDependenciesJobs(self):
     self._dependencies('1000')
 
   def _dependencies(self, jobs):
     """Verifies that dependencies are processed in the right order.
 
@@ skipping 43 matching lines @@
         # This foo/dir1/dir2 points to a different url than the one in bar.
         '  "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)
     actual = self._get_processed()
     first_3 = [
-        'svn://example.com/bar',
-        'svn://example.com/bar_empty',
-        'svn://example.com/foo',
+        ('bar', 'svn://example.com/bar'),
+        ('bar/empty', 'svn://example.com/bar_empty'),
+        ('foo', 'svn://example.com/foo'),
     ]
     if jobs != 1:
       # We don't care of the ordering of these items except that bar must be
       # before bar/empty.
       self.assertTrue(
-          actual.index('svn://example.com/bar') <
-          actual.index('svn://example.com/bar_empty'))
+          actual.index(('bar', 'svn://example.com/bar')) <
+          actual.index(('bar/empty', 'svn://example.com/bar_empty')))
       self.assertEquals(first_3, sorted(actual[0:3]))
     else:
       self.assertEquals(first_3, actual[0:3])
     self.assertEquals(
         [
-          'svn://example.com/foo/dir1',
-          'svn://example.com/bar/dir1/dir2',
-          'svn://example.com/foo/dir1/dir2/dir3',
-          'svn://example.com/foo/dir1/dir2/dir3/dir4',
-          'svn://example.com/foo/dir1/dir2/dir3/dir4/dir1/another',
+          ('foo/dir1', 'svn://example.com/foo/dir1'),
+          ('foo/dir1/dir2', 'svn://example.com/bar/dir1/dir2'),
+          ('foo/dir1/dir2/dir3', 'svn://example.com/foo/dir1/dir2/dir3'),
+          ('foo/dir1/dir2/dir3/dir4',
+           'svn://example.com/foo/dir1/dir2/dir3/dir4'),
+          ('foo/dir1/dir2/dir5/dir6',
+           'svn://example.com/foo/dir1/dir2/dir3/dir4/dir1/another'),
         ],
         actual[3:])
 
     self.assertEquals(3, len(obj.dependencies))
     self.assertEquals('foo', obj.dependencies[0].name)
     self.assertEquals('bar', obj.dependencies[1].name)
     self.assertEquals('bar/empty', obj.dependencies[2].name)
     self._check_requirements(
         obj.dependencies[0],
         {
@@ skipping 296 matching lines @@
 
     parser = gclient.OptionParser()
     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',
+          ('bar', 'svn://example.com/bar'),
+          ('bar/unix', 'svn://example.com/bar/unix'),
+          ('foo', 'svn://example.com/foo'),
+          ('foo/baz', 'svn://example.com/foo/baz'),
+          ('foo/unix', 'svn://example.com/foo/unix'),
           ],
         sorted(self._get_processed()))
 
   def testUpdateWithOsDeps(self):
     """Verifies that complicated deps_os constructs result in the
     correct data also with multple operating systems. Also see
     testDepsOsOverrideDepsInDepsFile."""
 
     test_data = [
       # Tuples of deps, deps_os, os_list and expected_deps.
@@ skipping 103 matching lines @@
 
     parser = gclient.OptionParser()
     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',
-          'svn://example.com/foo/src_unix',
-          'svn://example.com/foo/unix',
+          ('foo', 'svn://example.com/foo'),
+          ('foo/baz', 'svn://example.com/foo/baz'),
+          ('foo/src', 'svn://example.com/foo/src_unix'),
+          ('foo/unix', 'svn://example.com/foo/unix'),
           ],
         sorted(self._get_processed()))
 
   def testRecursionOverride(self):
     """Verifies gclient respects the |recursion| var syntax.
 
     We check several things here:
     - |recursion| = 3 sets recursion on the foo dep to exactly 3
       (we pull /fizz, but not /fuzz)
     - pulling foo/bar at recursion level 1 (in .gclient) is overriden by
@@ skipping 25 matching lines @@
         os.path.join('fizz', 'DEPS'),
         'deps = {\n'
         '  "fuzz": "/fuzz",\n'
         '}')
 
     options, _ = gclient.OptionParser().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',
+          ('foo', 'svn://example.com/foo'),
+          ('foo/bar', 'svn://example.com/bar'),
+          ('bar', 'svn://example.com/foo/bar'),
+          ('baz', 'svn://example.com/foo/bar/baz'),
+          ('fizz', 'svn://example.com/foo/bar/baz/fizz'),
         ],
         self._get_processed())
 
   def testRecursedepsOverride(self):
     """Verifies gclient respects the |recursedeps| var syntax.
 
     This is what we mean to check here:
     - |recursedeps| = [...] on 2 levels means we pull exactly 3 deps
       (up to /fizz, but not /fuzz)
     - pulling foo/bar with no recursion (in .gclient) is overriden by
@@ skipping 34 matching lines @@
         os.path.join('tar', 'DEPS'),
         'deps = {\n'
         '  "taz": "/taz",\n'
         '}')
 
     options, _ = gclient.OptionParser().parse_args([])
     obj = gclient.GClient.LoadCurrentConfig(options)
     obj.RunOnDeps('None', [])
     self.assertEquals(
         [
-          'svn://example.com/bar',
-          'svn://example.com/foo',
-          'svn://example.com/foo/bar',
-          'svn://example.com/foo/bar/baz',
-          'svn://example.com/foo/bar/baz/fizz',
-          'svn://example.com/tar',
+          ('bar', 'svn://example.com/foo/bar'),
+          ('baz', 'svn://example.com/foo/bar/baz'),
+          ('fizz', 'svn://example.com/foo/bar/baz/fizz'),
+          ('foo', 'svn://example.com/foo'),
+          ('foo/bar', 'svn://example.com/bar'),
+          ('foo/tar', 'svn://example.com/tar'),
         ],
         sorted(self._get_processed()))
 
   def testRecursedepsOverrideWithRelativePaths(self):
     """Verifies gclient respects |recursedeps| with relative paths."""
 
     write(
         '.gclient',
         'solutions = [\n'
         '  { "name": "foo", "url": "svn://example.com/foo" },\n'
@@ skipping 14 matching lines @@
         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(
         [
-          'svn://example.com/foo',
-          # use_relative_paths means the following dep evaluates with 'foo'
-          # prepended.
-          'svn://example.com/foo/bar',
+          ('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.
         ],
         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 59 matching lines @@
         os.path.join('fuzz', 'DEPS'),
         'deps = {\n'
         '  "tar": "/tar",\n'
         '}')
 
     options, _ = gclient.OptionParser().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',
+          ('foo', 'svn://example.com/foo'),
+          ('foo/bar', 'svn://example.com/bar'),
+          ('bar', 'svn://example.com/foo/bar'),
           # 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',
+          ('baz', 'svn://example.com/foo/bar/baz'),
+          ('fizz', '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.
 
@@ skipping 16 matching lines @@
         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',
+          ('foo', 'svn://example.com/foo'),
+          ('bar', 'svn://example.com/foo/bar'),
+          ('baz', '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).
     """
@@ skipping 13 matching lines @@
         os.path.join('foo', 'DEPS'),
         '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',
+          ('foo', 'svn://example.com/foo'),
+          ('bar', 'svn://example.com/foo/bar'),
         ],
         self._get_processed())
 
   def testGitDepsFallback(self):
     """Verifies gclient respects fallback to DEPS upon missing deps file."""
     write(
         '.gclient',
         'solutions = [\n'
         '  { "name": "foo", "url": "svn://example.com/foo",\n'
         '    "deps_file" : ".DEPS.git",\n'
         '  },\n'
           ']')
     write(
         os.path.join('foo', 'DEPS'),
         'deps = {\n'
         '  "bar": "/bar",\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',
+          ('foo', 'svn://example.com/foo'),
+          ('bar', 'svn://example.com/foo/bar'),
         ],
         self._get_processed())
 
   def testDepsFromNotAllowedHostsUnspecified(self):
     """Verifies gclient works fine with DEPS without allowed_hosts."""
     write(
         '.gclient',
         'solutions = [\n'
         '  { "name": "foo", "url": "svn://example.com/foo",\n'
         '    "deps_file" : ".DEPS.git",\n'
@@ skipping 113 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()