Automatically update submodule config entries on sync.

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 121 matching lines @@
         path = self.root_dir
       self.checkString(results[i][0][0], verb, (i, results[i][0][0], verb))
       if sys.platform == 'win32':
         # Make path lower case since casing can change randomly.
         self.checkString(
             results[i][0][2].lower(),
             path.lower(),
             (i, results[i][0][2].lower(), path.lower()))
       else:
         self.checkString(results[i][0][2], path, (i, results[i][0][2], path))
-    self.assertEquals(len(results), len(items), (stdout, items, len(results)))
+    self.assertEquals(len(results), len(items), (stdout, items, len(items), len(results)))

[M-A Ruel, 2012/05/31 01:35:52]

please wrap

[szager1, 2012/05/31 06:39:45]

Done.

     return results
 
   @staticmethod
   def svnBlockCleanup(out):
     """Work around svn status difference between svn 1.5 and svn 1.6
     I don't know why but on Windows they are reversed. So sorts the items."""
     for i in xrange(len(out)):
       if len(out[i]) < 2:
         continue
       out[i] = [out[i][0]] + sorted([x[1:].strip() for x in out[i][1:]])
@@ skipping 637 matching lines @@
     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'])
+                      ['running', ('running', self.root_dir + '/src'),

[M-A Ruel, 2012/05/31 01:35:52]

BTW, you should asked for help here, I guess you struggled a bit with it.

[szager1, 2012/05/31 06:39:45]

I must say, these expectations were really laborious to update, and it's not at
all clear to me what exactly is being tested, other than gclient not completely
self-destructing.

[M-A Ruel, 2012/06/01 01:57:50]

Outputs used to be flaky. This assert that all the headers were printed
correctly.

+                       'running', ('running', self.root_dir + '/src/repo2'),
+                       'running',
+                       ('running', self.root_dir + '/src/repo2/repo_renamed'),
+                       'running', 'running'])
     # 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'])
+                       [('running', self.root_dir + '/src'),
+                        ('running', self.root_dir + '/src/repo2'),
+                        'running',
+                        ('running', self.root_dir + '/src/repo2/repo3'),
+                        'running',
+                        ('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])
+        [('running', self.root_dir + '/src'),
+         ('running', self.root_dir + '/src/repo2'),
+         'running',
+         ('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',
+         ('running', self.root_dir + '/src'),
+         'running',
+         ('running', self.root_dir + '/src/repo2'),
+         'running',
+         ('running', self.root_dir + '/src/repo2/repo_renamed'),
+         'running', 'running'],
         'Please fix your script, having invalid --revision flags '
             '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'])
+                      ['running',
+                       ('running', self.root_dir + '/src'),
+                       'running',
+                       ('running', self.root_dir + '/src/repo2'),
+                       'running',
+                       ('running', self.root_dir + '/src/repo2/repo3'),
+                       'running',
+                       ('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'],
+                      ['running',
+                       ('running', self.root_dir + '/src'),
+                       'running',
+                       ('running', self.root_dir + '/src/repo2'),
+                       'running',
+                       ('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', self.root_dir + '/src'),
+         ('running', self.root_dir + '/src/repo2'),
+         'running',
+         ('running', self.root_dir + '/src/repo4'),
+         'running',
+         ('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', self.root_dir + '/src'),
+                       ('running', self.root_dir + '/src/repo2'),
+                       'running',
+                       ('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'
@@ skipping 100 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', ('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', 'running', 'running',
+         ('running', self.root_dir + '/src/repo2'),
+         'running',
+         ('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'])
     tree['src/git_hooked1'] = 'git_hooked1'
@@ skipping 10 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',
+         ('running', self.root_dir + '/src-git'),
+         'running',
+         'running', 'running', 'running',
+         ('running', self.root_dir + '/src/repo2'),
+         'running',
+         ('running', self.root_dir + '/src/repo2/repo3'),
+         'running',
+         ('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()