Allow gclient clone in non-empty directories

tests/gclient_smoketest.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.
 
 """Smoke tests for gclient.py.
 
 Shell out 'gclient' and run basic conformance tests.
 
 This test assumes GClientSmokeBase.URL_BASE is valid.
@@ skipping 821 matching lines @@
   def setUp(self):
     super(GClientSmokeGIT, self).setUp()
     self.enabled = self.FAKE_REPOS.set_up_git()
 
   def testSync(self):
     if not self.enabled:
       return
     # TODO(maruel): safesync.
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     # Test unversioned checkout.
-    self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
-                      ['running', 'running', 'running', 'running', 'running'])
+    self.parseGclient(
+        ['sync', '--deps', 'mac', '--jobs', '1'],
+        ['running',
+         # Git checkout.
+         ('running', self.root_dir + '/src'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2/repo_renamed'),
+         'running', 'running'])

[iannucci, 2013/07/20 01:35:39]

wdyt about:

[
  'running',
  ('running', ...),  # Git checkout
  ...
]

And if you're going to make everything on its own line, then we should make sure
to do that for all of these (some still end with """'running', 'running',
'running']""" on a line)

[Isaac (away), 2013/07/20 01:54:52]

I'll remove comments.

     # TODO(maruel): http://crosbug.com/3582 hooks run even if not matching, must
     # add sync parsing to get the list of updated files.
     tree = self.mangle_git_tree(('repo_1@2', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
     # Manually remove git_hooked1 before synching to make sure it's not
     # recreated.
     os.remove(join(self.root_dir, 'src', 'git_hooked1'))
 
     # Test incremental versioned sync: sync backward.
     diffdir = os.path.join(self.root_dir, 'src', 'repo2', 'repo_renamed')
-    self.parseGclient(['sync', '--jobs', '1', '--revision',
-                       'src@' + self.githash('repo_1', 1),
-                       '--deps', 'mac', '--delete_unversioned_trees'],
-                       ['running', 'running', ('running', diffdir), 'deleting'])
+    self.parseGclient(
+        ['sync', '--jobs', '1', '--revision',
+        'src@' + self.githash('repo_1', 1),
+        '--deps', 'mac', '--delete_unversioned_trees'],
+        ['running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2/repo3'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo4'),
+         ('running', diffdir), 'deleting'])
     tree = self.mangle_git_tree(('repo_1@1', 'src'),
                                 ('repo_2@2', 'src/repo2'),
                                 ('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.
     expect3 = ('running', os.path.join(self.root_dir, 'src', 'repo2', 'repo3'))
     expect4 = ('running', os.path.join(self.root_dir, 'src', 'repo4'))
-    self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
-        ['running', 'running', 'running', expect3, expect4])
+    self.parseGclient(
+        ['sync', '--deps', 'mac', '--jobs', '1'],
+        ['running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2/repo_renamed'),
+         'running', 'running', expect3, expect4])
     tree = self.mangle_git_tree(('repo_1@2', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('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
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     self.parseGclient(
         ['sync', '--deps', 'mac', '--jobs', '1',
          '--revision', 'invalid@' + self.githash('repo_1', 1)],
-        ['running', 'running', 'running', 'running', 'running'],
+        ['running',
+         # Git checkout.
+         ('running', self.root_dir + '/src'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2/repo_renamed'),
+         'running', 'running'],
         'Please fix your script, having invalid --revision flags '
-            'will soon considered an error.\n')
+        'will soon considered an error.\n')
     tree = self.mangle_git_tree(('repo_1@2', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
   def testSyncNoSolutionName(self):
     if not self.enabled:
       return
     # When no solution name is provided, gclient uses the first solution listed.
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
-    self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1',
-                       '--revision', self.githash('repo_1', 1)],
-                      ['running', 'running', 'running', 'running'])
+    self.parseGclient(
+        ['sync', '--deps', 'mac', '--jobs', '1',
+         '--revision', self.githash('repo_1', 1)],
+        ['running',
+         # Git checkout.
+         ('running', self.root_dir + '/src'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2/repo3'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo4'),])
     tree = self.mangle_git_tree(('repo_1@1', 'src'),
                                 ('repo_2@2', 'src/repo2'),
                                 ('repo_3@1', 'src/repo2/repo3'),
                                 ('repo_4@2', 'src/repo4'))
     self.assertTree(tree)
 
   def testSyncJobs(self):
     if not self.enabled:
       return
     # TODO(maruel): safesync.
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     # Test unversioned checkout.
-    self.parseGclient(['sync', '--deps', 'mac', '--jobs', '8'],
-                      ['running', 'running', 'running', 'running', 'running'],
-                      untangle=True)
+    self.parseGclient(
+        ['sync', '--deps', 'mac', '--jobs', '8'],
+        ['running',
+         # Git checkout.
+         ('running', self.root_dir + '/src'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2/repo_renamed'),
+         'running', 'running'],
+        untangle=True)
     # TODO(maruel): http://crosbug.com/3582 hooks run even if not matching, must
     # add sync parsing to get the list of updated files.
     tree = self.mangle_git_tree(('repo_1@2', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
     # Manually remove git_hooked1 before synching to make sure it's not
     # recreated.
     os.remove(join(self.root_dir, 'src', 'git_hooked1'))
 
     # Test incremental versioned sync: sync backward.
     expect3 = ('running',
                os.path.join(self.root_dir, 'src', 'repo2', 'repo_renamed'))
     self.parseGclient(
         ['sync', '--revision', 'src@' + self.githash('repo_1', 1),
           '--deps', 'mac', '--delete_unversioned_trees', '--jobs', '8'],
-        ['running', 'running', expect3, 'deleting'],
+        ['running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo4'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2/repo3'),
+         expect3, 'deleting'],
         untangle=True)
     tree = self.mangle_git_tree(('repo_1@1', 'src'),
                                 ('repo_2@2', 'src/repo2'),
                                 ('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.
     expect4 = os.path.join(self.root_dir, 'src', 'repo2', 'repo3')
     expect5 = os.path.join(self.root_dir, 'src', 'repo4')
-    self.parseGclient(['sync', '--deps', 'mac', '--jobs', '8'],
-                      ['running', 'running', 'running',
-                       ('running', expect4),
-                       ('running', expect5)],
-                      untangle=True)
+    self.parseGclient(
+        ['sync', '--deps', 'mac', '--jobs', '8'],
+        ['running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2/repo_renamed'),
+         'running', 'running',
+         ('running', expect4),
+         ('running', expect5)],
+        untangle=True)
     tree = self.mangle_git_tree(('repo_1@2', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('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 testRevertAndStatus(self):
@@ skipping 98 matching lines @@
   def testMultiSolutions(self):
     if not self.enabled:
       return
     self.gclient(['config', '--spec',
         'solutions=['
         '{"name": "src",'
         ' "url": "' + self.svn_base + 'trunk/src/"},'
         '{"name": "src-git",'
         '"url": "' + self.git_base + 'repo_1"}]'])
     self.parseGclient(['sync', '--deps', 'mac', '--jobs', '1'],
-        ['running', 'running', 'running',
+        ['running', 'running',
+        # Git checkout.
+         ('running', self.root_dir + '/src-git'),
+         'running',
          # This is due to the way svn update is called for a single
          # file when File() is used in a DEPS file.
          ('running', self.root_dir + '/src/file/other'),
-         'running', 'running', 'running', 'running', 'running', 'running',
+         'running', 'running', 'running', 'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2'),
+         'running',
+         # Git checkout.
+         ('running', self.root_dir + '/src/repo2/repo_renamed'),
+         'running',
          'running', 'running'])
     tree = self.mangle_git_tree(('repo_1@2', 'src-git'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree.update(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'])
@@ skipping 11 matching lines @@
         ' "url": "' + self.svn_base + 'trunk/src/"},'
         '{"name": "src-git",'
         '"url": "' + self.git_base + 'repo_1"}]'])
     # There is no guarantee that the ordering will be consistent.
     (stdout, stderr, returncode) = self.gclient(
         ['sync', '--deps', 'mac', '--jobs', '8'])
     stdout = self.untangle(stdout)
     self.checkString('', stderr)
     self.assertEquals(0, returncode)
     results = self.splitBlock(stdout)
-    self.assertEquals(12, len(results))
+    self.assertEquals(15, len(results))
     tree = self.mangle_git_tree(('repo_1@2', 'src-git'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree.update(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/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
   def testMultiSolutionsMultiRev(self):
     if not self.enabled:
       return
     self.gclient(['config', '--spec',
         'solutions=['
         '{"name": "src",'
         ' "url": "' + self.svn_base + 'trunk/src/"},'
         '{"name": "src-git",'
         '"url": "' + self.git_base + 'repo_1"}]'])
     self.parseGclient(
         ['sync', '--deps', 'mac', '--jobs', '1', '--revision', '1',
          '-r', 'src-git@' + self.githash('repo_1', 1)],
-        ['running', 'running', 'running', 'running',
-         'running', 'running', 'running', 'running'],
+        ['running', 'running',
+        # Git checkout.
+        ('running', self.root_dir + '/src-git'),
+        'running', 'running',
+         'running', 'running',
+        # Git checkout.
+        ('running', self.root_dir + '/src/repo2'),
+         'running',
+        # Git checkout.
+        ('running', self.root_dir + '/src/repo2/repo3'),
+         'running',
+        # Git checkout.
+        ('running', self.root_dir + '/src/repo4'),],
         expected_stderr=
             'You must specify the full solution name like --revision src@1\n'
             'when you have multiple solutions setup in your .gclient file.\n'
             'Other solutions present are: src-git.\n')
     tree = self.mangle_git_tree(('repo_1@1', 'src-git'),
                                 ('repo_2@2', 'src/repo2'),
                                 ('repo_3@1', 'src/repo2/repo3'),
                                 ('repo_4@2', 'src/repo4'))
     tree.update(self.mangle_svn_tree(
         ('trunk/src@1', 'src'),
@@ skipping 173 matching lines @@
 
   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()