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

tests/fake_repos.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.
 
 """Generate fake repositories for testing."""
 
 import atexit
 import errno
 import logging
@@ skipping 196 matching lines @@
   HOST = '127.0.0.1'
 
   def __init__(self, trial_dir=None, leak=None, host=None):
     global _FAKE_LOADED
     if _FAKE_LOADED:
       raise Exception('You can only start one FakeRepos at a time.')
     _FAKE_LOADED = True
     # Quick hack.
     if '-v' in sys.argv:
       logging.basicConfig(level=logging.DEBUG)
-    if '-l' in sys.argv:
-      self.SHOULD_LEAK = True
-      sys.argv.remove('-l')
     elif leak is not None:
       self.SHOULD_LEAK = leak
     if host:
       self.HOST = host
     if trial_dir:
       self.TRIAL_DIR = trial_dir
 
     # Format is [ None, tree, tree, ...]
     # i.e. revisions are 1-based.
     self.svn_revs = [None]
@@ skipping 104 matching lines @@
 
     # Testing:
     # - dependency disapear
     # - dependency renamed
     # - versioned and unversioned reference
     # - relative and full reference
     # - deps_os
     # - var
     # - hooks
     # TODO(maruel):
+    # - From
     # - File
     # - $matching_files
     # - use_relative_paths
-    self._commit_svn(file_system(1, """
+    fs = file_system(1, """
 vars = {
   'DummyVariable': 'third_party',
 }
 deps = {
-  'src/other': 'svn://%(host)s/svn/trunk/other',
+  'src/other': 'svn://%(host)s/svn/trunk/other@1',
   'src/third_party/fpp': '/trunk/' + Var('DummyVariable') + '/foo',
 }
 deps_os = {
   'mac': {
     'src/third_party/prout': '/trunk/third_party/prout',
   },
-}""" % { 'host': self.HOST }))
+}""" % { 'host': self.HOST })
+    self._commit_svn(fs)
 
-    self._commit_svn(file_system(2, """
+    fs = file_system(2, """
 deps = {
   'src/other': 'svn://%(host)s/svn/trunk/other',
   'src/third_party/foo': '/trunk/third_party/foo@1',
+  #'src/third_party/foo': From('src/other', 'foo/bar'),
 }
 # I think this is wrong to have the hooks run from the base of the gclient
 # checkout. It's maybe a bit too late to change that behavior.
 hooks = [
   {
     'pattern': '.',
     'action': ['python', '-c',
                'open(\\'src/svn_hooked1\\', \\'w\\').write(\\'svn_hooked1\\')'],
   },
   {
     # Should not be run.
     'pattern': 'nonexistent',
     'action': ['python', '-c',
                'open(\\'src/svn_hooked2\\', \\'w\\').write(\\'svn_hooked2\\')'],
   },
 ]
-""" % { 'host': self.HOST }))
+""" % { 'host': self.HOST })
+    fs['trunk/other/DEPS'] = """
+deps = {
+  'foo/bar': '/trunk/third_party/foo@1',
+}
+"""
+    self._commit_svn(fs)
 
   def setUpGIT(self):
     """Creates git repositories and start the servers."""
     if self.gitdaemon:
       return True
     self.setUp()
     if sys.platform == 'win32':
       return False
     for repo in ['repo_%d' % r for r in range(1, 5)]:
       check_call(['git', 'init', '-q', join(self.git_root, repo)])
       self.git_hashes[repo] = [None]
 
     # Testing:
     # - dependency disapear
     # - dependency renamed
     # - versioned and unversioned reference
     # - relative and full reference
     # - deps_os
     # - var
     # - hooks
     # TODO(maruel):
+    # - From
     # - File
     # - $matching_files
     # - use_relative_paths
+    self._commit_git('repo_3', {
+      'origin': 'git/repo_3@1\n',
+    })
+
+    self._commit_git('repo_3', {
+      'origin': 'git/repo_3@2\n',
+    })
+
     self._commit_git('repo_1', {
       'DEPS': """
 vars = {
   'DummyVariable': 'repo',
 }
 deps = {
   'src/repo2': 'git://%(host)s/git/repo_2',
-  'src/repo2/repo3': '/' + Var('DummyVariable') + '_3',
+  'src/repo2/repo3': '/' + Var('DummyVariable') + '_3@%(hash3)s',
 }
 deps_os = {
   'mac': {
     'src/repo4': '/repo_4',
   },
-}""" % { 'host': self.HOST },
-      'origin': 'git/repo_1@1\n',
+}""" % {
+            'host': self.HOST,
+            # See self.__init__() for the format. Grab's the hash of the first
+            # commit in repo_2. Only keep the first 7 character because of:
+            # TODO(maruel): http://crosbug.com/3591 We need to strip the hash..
+            # duh.
+            'hash3': self.git_hashes['repo_3'][1][0][:7]
+        },
+        'origin': 'git/repo_1@1\n',
     })
 
     self._commit_git('repo_2', {
-      'origin': "git/repo_2@1\n"
+      'origin': 'git/repo_2@1\n',
+      'DEPS': """
+deps = {
+  'foo/bar': '/repo_3',
+}
+""",
     })
 
     self._commit_git('repo_2', {
-      'origin': "git/repo_2@2\n"
-    })
-
-    self._commit_git('repo_3', {
-      'origin': "git/repo_3@1\n"
-    })
-
-    self._commit_git('repo_3', {
-      'origin': "git/repo_3@2\n"
+      'origin': 'git/repo_2@2\n',
     })
 
     self._commit_git('repo_4', {
-      'origin': "git/repo_4@1\n"
+      'origin': 'git/repo_4@1\n',
     })
 
     self._commit_git('repo_4', {
-      'origin': "git/repo_4@2\n"
+      'origin': 'git/repo_4@2\n',
     })
 
     self._commit_git('repo_1', {
       'DEPS': """
 deps = {
   'src/repo2': 'git://%(host)s/git/repo_2@%(hash)s',
   'src/repo2/repo_renamed': '/repo_3',
+  #'src/repo2/repo_renamed': From('src/repo2', 'foo/bar'),
 }
 # I think this is wrong to have the hooks run from the base of the gclient
 # checkout. It's maybe a bit too late to change that behavior.
 hooks = [
   {
     'pattern': '.',
     'action': ['python', '-c',
                'open(\\'src/git_hooked1\\', \\'w\\').write(\\'git_hooked1\\')'],
   },
   {
     # Should not be run.
     'pattern': 'nonexistent',
     'action': ['python', '-c',
                'open(\\'src/git_hooked2\\', \\'w\\').write(\\'git_hooked2\\')'],
   },
 ]
 """ % {
         'host': self.HOST,
         # See self.__init__() for the format. Grab's the hash of the first
         # commit in repo_2. Only keep the first 7 character because of:
         # TODO(maruel): http://crosbug.com/3591 We need to strip the hash.. duh.
         'hash': self.git_hashes['repo_2'][1][0][:7]
       },
-      'origin': "git/repo_1@2\n"
+      'origin': 'git/repo_1@2\n',
     })
 
     # Start the daemon.
     cmd = ['git', 'daemon', '--export-all', '--base-path=' + self.repos_dir]
     if self.HOST == '127.0.0.1':
       cmd.append('--listen=127.0.0.1')
     logging.debug(cmd)
     self.gitdaemon = Popen(cmd, cwd=self.repos_dir)
     return True
 
@@ skipping 18 matching lines @@
       new_tree = tree.copy()
     self.git_hashes[repo].append((hash, new_tree))
 
 
 class FakeReposTestBase(unittest.TestCase):
   """This is vaguely inspired by twisted."""
 
   # Replace this in your subclass.
   CLASS_ROOT_DIR = None
 
-  # static FakeRepos instance.
-  FAKE_REPOS = FakeRepos()
+  # static FakeRepos instance. Lazy loaded.
+  FAKE_REPOS = None
+
+  def __init__(self, *args, **kwargs):
+    unittest.TestCase.__init__(self, *args, **kwargs)
+    if not FakeReposTestBase.FAKE_REPOS:
+      FakeReposTestBase.FAKE_REPOS = FakeRepos()
 
   def setUp(self):
     unittest.TestCase.setUp(self)
     self.FAKE_REPOS.setUp()
 
     # Remove left overs and start fresh.
     if not self.CLASS_ROOT_DIR:
       self.CLASS_ROOT_DIR = join(self.FAKE_REPOS.trial_dir(), 'smoke')
     self.root_dir = join(self.CLASS_ROOT_DIR, self.id())
     rmtree(self.root_dir)
@@ skipping 73 matching lines @@
   print 'Using %s' % fake.trial_dir()
   try:
     fake.setUp()
     print('Fake setup, press enter to quit or Ctrl-C to keep the checkouts.')
     sys.stdin.readline()
   except KeyboardInterrupt:
     fake.SHOULD_LEAK = True
   return 0
 
 
+# Kind of hack.
+if '-l' in sys.argv:
+  FakeRepos.SHOULD_LEAK = True
+  sys.argv.remove('-l')
+
+
 if __name__ == '__main__':
   sys.exit(main(sys.argv))