Add a new regression test for custom_deps in .gclient files.

tests/gclient_smoketest.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 """Smoke tests for gclient.py.
 
 Shell out 'gclient' and run basic conformance tests.
 
 This test assumes GClientSmokeBase.URL_BASE is valid.
@@ skipping 244 matching lines @@
     GClientSmokeBase.setUp(self)
     self.enabled = self.FAKE_REPOS.setUpSVN()
 
   def testSync(self):
     # TODO(maruel): safesync.
     if not self.enabled:
       return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     # Test unversioned checkout.
     self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
-                      ['running', 'running',
-                       # This is due to the way svn update is called for a
-                       # single file when File() is used in a DEPS file.
-                       ('running', os.path.join(self.root_dir, 'src', 'file', 'other')),
-                       'running', 'running', 'running', 'running'])
+        ['running', 'running',
+          # This is due to the way svn update is called for a
+          # single file when File() is used in a DEPS file.
+          ('running', os.path.join(self.root_dir, 'src', 'file', 'other')),
+          'running', 'running', 'running', 'running'])
     tree = self.mangle_svn_tree(
         ('trunk/src@2', 'src'),
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other'))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
     # Manually remove svn_hooked1 before synching to make sure it's not
@@ skipping 115 matching lines @@
         ('trunk/src@2', 'src'),
         ('trunk/third_party/foo@2', 'src/third_party/fpp'),
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other'),
         ('trunk/third_party/foo@2', 'src/third_party/prout'))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
+  def testSyncCustomDeps(self):
+    if not self.enabled:
+      return
+    out = (
+        'solutions = [\n'
+        '  { "name"        : "src",\n'
+        '    "url"         : "%(base)s/src",\n'
+        '    "custom_deps" : {\n'
+        # Remove 2 deps, change 1, add 1.
+        '      "src/other": None,\n'
+        '      "src/third_party/foo": \'%(base)s/third_party/prout\',\n'
+        '      "src/file/other": None,\n'
+        '      "new_deps": "/trunk/src/third_party",\n'
+        '    },\n'
+        '    "safesync_url": "",\n'
+        '  },\n'
+        ']\n\n' %
+      { 'base': self.svn_base + 'trunk' })
+    fileobj = open(os.path.join(self.root_dir, '.gclient'), 'w')
+    fileobj.write(out)
+    fileobj.close()
+    self.parseGclient(
+        ['sync', '--deps', 'mac', '--jobs', '1'],
+        ['running', 'running', 'running', 'running'],
+        untangle=True)
+    tree = self.mangle_svn_tree(
+        ('trunk/src@2', 'src'),
+        ('trunk/third_party/prout@2', 'src/third_party/foo'),
+        ('trunk/src/third_party@2', 'new_deps'))
+    tree['src/svn_hooked1'] = 'svn_hooked1'
+    self.assertTree(tree)
+
   def testRevertAndStatus(self):
     if not self.enabled:
       return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     # Tested in testSync.
     self.gclient(['sync', '--deps', 'mac'])
     write(join(self.root_dir, 'src', 'other', 'hi'), 'Hey!')
 
     out = self.parseGclient(['status', '--deps', 'mac', '--jobs', '1'],
                             [['running', join(self.root_dir, 'src')],
@@ skipping 685 matching lines @@
 if __name__ == '__main__':
   if '-c' in sys.argv:
     COVERAGE = True
     sys.argv.remove('-c')
     if os.path.exists('.coverage'):
       os.remove('.coverage')
     os.environ['COVERAGE_FILE'] = os.path.join(
         os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
         '.coverage')
   unittest.main()