Add more forced revisions in fake_repos.py and adds a recursive DEPS.

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 200 matching lines @@
     # recreated.
     os.remove(join(self.root_dir, 'src', 'svn_hooked1'))
 
     # Test incremental versioned sync: sync backward.
     self.parseGclient(['sync', '--revision', 'src@1', '--deps', 'mac',
                        '--delete_unversioned_trees'],
                       ['running', 'running', 'running', 'running', 'deleting'])
     tree = self.mangle_svn_tree(
         ('trunk/src@1', 'src'),
         ('trunk/third_party/foo@2', 'src/third_party/fpp'),
-        ('trunk/other@2', 'src/other'),
+        ('trunk/other@1', 'src/other'),
         ('trunk/third_party/foo@2', 'src/third_party/prout'))
     self.assertTree(tree)
     # Test incremental sync: delete-unversioned_trees isn't there.
     self.parseGclient(['sync', '--deps', 'mac'],
                       ['running', 'running', 'running', 'running'])
     tree = self.mangle_svn_tree(
         ('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'),
@@ skipping 17 matching lines @@
     self.assertTree(tree)
 
   def testSyncNoSolutionName(self):
     # When no solution name is provided, gclient uses the first solution listed.
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.parseGclient(['sync', '--deps', 'mac', '-r', '1'],
                       ['running', 'running', 'running', 'running'])
     tree = self.mangle_svn_tree(
         ('trunk/src@1', 'src'),
         ('trunk/third_party/foo@2', 'src/third_party/fpp'),
-        ('trunk/other@2', 'src/other'),
+        ('trunk/other@1', 'src/other'),
         ('trunk/third_party/foo@2', 'src/third_party/prout'))
     self.assertTree(tree)
 
   def testRevertAndStatus(self):
     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'],
@@ skipping 69 matching lines @@
     # TODO(maruel): In general, gclient revert output is wrong. It should output
     # the file list after some ___ running 'svn status'
     results = self.gclient(['revert', '--deps', 'mac'])
     out = self.splitBlock(results[0])
     self.assertEquals(7, len(out))
     self.checkString('', results[1])
     self.assertEquals(0, results[2])
     tree = self.mangle_svn_tree(
         ('trunk/src@1', 'src'),
         ('trunk/third_party/foo@2', 'src/third_party/fpp'),
-        ('trunk/other@2', 'src/other'),
+        ('trunk/other@1', 'src/other'),
         ('trunk/third_party/prout@2', 'src/third_party/prout'))
     self.assertTree(tree)
 
     out = self.parseGclient(['status', '--deps', 'mac'],
                             [['running', join(self.root_dir, 'src')]])
     out = self.svnBlockCleanup(out)
     self.checkString('other', out[0][1])
     self.checkString(join('third_party', 'fpp'), out[0][2])
     self.checkString(join('third_party', 'prout'), out[0][3])
     self.assertEquals(4, len(out[0]))
@@ skipping 57 matching lines @@
                             'src@' + self.githash('repo_1', 1),
                             '--deps', 'mac', '--delete_unversioned_trees'])
     # gclient's git output is unparsable and all messed up. Don't look at it, it
     # hurts the smoke test's eyes. Add "print out" here if you want to dare to
     # parse it. So just assert it's not empty and look at the result on the file
     # system instead.
     self.assertEquals('', results[1])
     self.assertEquals(0, results[2])
     tree = self.mangle_git_tree(('repo_1@1', 'src'),
                                 ('repo_2@2', 'src/repo2'),
-                                ('repo_3@2', 'src/repo2/repo3'),
+                                ('repo_3@1', 'src/repo2/repo3'),
                                 ('repo_4@2', 'src/repo4'))
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
     # Test incremental sync: delete-unversioned_trees isn't there.
     results = self.gclient(['sync', '--deps', 'mac'])
     # See comment above about parsing gclient's git output.
     self.assertEquals('', results[1])
     self.assertEquals(0, results[2])
     tree = self.mangle_git_tree(('repo_1@2', 'src'),
                                 ('repo_2@1', 'src/repo2'),
-                                ('repo_3@2', 'src/repo2/repo3'),
+                                ('repo_3@1', 'src/repo2/repo3'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'),
                                 ('repo_4@2', 'src/repo4'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
   def testSyncIgnoredSolutionName(self):
     """TODO(maruel): This will become an error soon."""
     if not self.enabled:
       return
@@ skipping 25 matching lines @@
     results = self.gclient(['sync', '--deps', 'mac',
                             '--revision', self.githash('repo_1', 1)])
     self.checkBlock(results[0], [])
     # TODO(maruel): git shouldn't output to stderr...
     #self.checkString('Switched to a new branch \'%s\'\n'
     #    % self.githash('repo_1', 1), results[1])
     self.checkString('', results[1])
     self.assertEquals(0, results[2])
     tree = self.mangle_git_tree(('repo_1@1', 'src'),
                                 ('repo_2@2', 'src/repo2'),
-                                ('repo_3@2', 'src/repo2/repo3'),
+                                ('repo_3@1', 'src/repo2/repo3'),
                                 ('repo_4@2', 'src/repo4'))
     self.assertTree(tree)
 
   def testRevertAndStatus(self):
     """TODO(maruel): Remove this line once this test is fixed."""
     if not self.enabled:
       return
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     # Tested in testSync.
     self.gclient(['sync', '--deps', 'mac'])
@@ skipping 120 matching lines @@
         '"url": "' + self.git_base + 'repo_1"}]'])
     results = self.gclient(['sync', '--deps', 'mac', '--revision', '1',
                             '-r', 'src-git@' + self.githash('repo_1', 1)])
     self.checkBlock(results[0], ['running', 'running', 'running', 'running'])
     # TODO(maruel): Something's wrong here. git outputs to stderr 'Switched to
     # new branch \'hash\''.
     #self.checkString('', results[1])
     self.assertEquals(0, results[2])
     tree = self.mangle_git_tree(('repo_1@1', 'src-git'),
                                 ('repo_2@2', 'src/repo2'),
-                                ('repo_3@2', 'src/repo2/repo3'),
+                                ('repo_3@1', 'src/repo2/repo3'),
                                 ('repo_4@2', 'src/repo4'))
     tree.update(self.mangle_svn_tree(
         ('trunk/src@1', 'src'),
         ('trunk/third_party/foo@2', 'src/third_party/fpp'),
-        ('trunk/other@2', 'src/other'),
+        ('trunk/other@1', 'src/other'),
         ('trunk/third_party/foo@2', 'src/third_party/prout')))
     self.assertTree(tree)
 
 
 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()