Improve testing with File() keyword, found a few bugs along the way

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 186 matching lines @@
 class GClientSmokeSVN(GClientSmokeBase):
   def setUp(self):
     GClientSmokeBase.setUp(self)
     self.FAKE_REPOS.setUpSVN()
 
   def testSync(self):
     # TODO(maruel): safesync.
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     # Test unversioned checkout.
     self.parseGclient(['sync', '--deps', 'mac'],
-                      ['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', self.root_dir + '/src/file/foo'),
+                       '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/foo/origin'] = 'svn/trunk/third_party/foo@2\n'
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
     # Manually remove svn_hooked1 before synching to make sure it's not
     # 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@1', 'src/other'),
         ('trunk/third_party/foo@2', 'src/third_party/prout'))
+    tree['src/file/foo/origin'] = 'svn/trunk/third_party/foo@2\n'
     self.assertTree(tree)
     # Test incremental sync: delete-unversioned_trees isn't there.
     self.parseGclient(['sync', '--deps', 'mac'],
-                      ['running', 'running', 'running', 'running'])
+                      ['running', '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'),
         ('trunk/third_party/foo@2', 'src/third_party/prout'))
+    tree['src/file/foo/origin'] = 'svn/trunk/third_party/foo@2\n'
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
   def testSyncIgnoredSolutionName(self):
     """TODO(maruel): This will become an error soon."""
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     results = self.gclient(['sync', '--deps', 'mac', '-r', 'invalid@1'])
-    self.checkBlock(results[0], ['running', 'running', 'running', 'running'])
+    self.checkBlock(results[0], [
+        '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', self.root_dir + '/src/file/foo'),
+        'running', 'running', 'running', 'running'])
     self.checkString('Please fix your script, having invalid --revision flags '
         'will soon considered an error.\n', results[1])
     self.assertEquals(0, results[2])
     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/foo/origin'] = 'svn/trunk/third_party/foo@2\n'
     tree['src/svn_hooked1'] = 'svn_hooked1'
     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@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'],
                             [['running', join(self.root_dir, 'src')],
                              ['running', join(self.root_dir, 'src', 'other')]])
     out = self.svnBlockCleanup(out)
-    self.checkString('other', out[0][1])
-    self.checkString('svn_hooked1', out[0][2])
-    self.checkString(join('third_party', 'foo'), out[0][3])
+    self.checkString('file', out[0][1])
+    self.checkString('other', out[0][2])
+    self.checkString('svn_hooked1', out[0][3])
+    self.checkString(join('third_party', 'foo'), out[0][4])
     self.checkString('hi', out[1][1])
-    self.assertEquals(4, len(out[0]))
+    self.assertEquals(5, len(out[0]))
     self.assertEquals(2, len(out[1]))
 
     # Revert implies --force implies running hooks without looking at pattern
     # matching.
     results = self.gclient(['revert', '--deps', 'mac'])
     out = self.splitBlock(results[0])
     # src, src/other is missing, src/other, src/third_party/foo is missing,
-    # src/third_party/foo, 2 svn hooks.
-    self.assertEquals(7, len(out))
+    # src/third_party/foo, 2 svn hooks, 3 related to File().
+    self.assertEquals(10, len(out))
     self.checkString('', results[1])
     self.assertEquals(0, results[2])
     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/foo/origin'] = 'svn/trunk/third_party/foo@2\n'
     tree['src/svn_hooked1'] = 'svn_hooked1'
     tree['src/svn_hooked2'] = 'svn_hooked2'
     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('svn_hooked1', out[0][2])
-    self.checkString('svn_hooked2', out[0][3])
-    self.checkString(join('third_party', 'foo'), out[0][4])
-    self.assertEquals(5, len(out[0]))
+    self.checkString('file', out[0][1])
+    self.checkString('other', out[0][2])
+    self.checkString('svn_hooked1', out[0][3])
+    self.checkString('svn_hooked2', out[0][4])
+    self.checkString(join('third_party', 'foo'), out[0][5])
+    self.assertEquals(6, len(out[0]))
+    self.assertEquals(1, len(out))
 
   def testRevertAndStatusDepsOs(self):
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     # Tested in testSync.
     self.gclient(['sync', '--deps', 'mac', '--revision', 'src@1'])
     write(join(self.root_dir, 'src', 'other', 'hi'), 'Hey!')
 
     # Without --verbose, gclient won't output the directories without
     # modification.
     out = self.parseGclient(['status', '--deps', 'mac'],
@@ skipping 265 matching lines @@
       return
     self.gclient(['config', '--spec',
         'solutions=['
         '{"name": "src",'
         ' "url": "' + self.svn_base + 'trunk/src/"},'
         '{"name": "src-git",'
         '"url": "' + self.git_base + 'repo_1"}]'])
     results = self.gclient(['sync', '--deps', 'mac'])
     # 3x svn checkout, 3x run hooks
     self.checkBlock(results[0],
-                    ['running', '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', self.root_dir + '/src/file/foo'),
+                     'running', 'running', 'running', '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@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/foo/origin'] = 'svn/trunk/third_party/foo@2\n'
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     tree['src/svn_hooked1'] = 'svn_hooked1'
     tree['src/svn_hooked2'] = 'svn_hooked2'
     self.assertTree(tree)
 
   def testMultiSolutionsMultiRev(self):
     if not self.enabled:
       return
     self.gclient(['config', '--spec',
@@ skipping 50 matching lines @@
       return
     self.gclient(['config', '--spec',
         'solutions=['
         '{"name": "src",'
         ' "url": "' + self.svn_base + 'trunk/src/"},'
         '{"name": "src-git",'
         '"url": "' + self.git_base + 'repo_1"}]'])
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['recurse', 'sh', '-c',
                             'echo $GCLIENT_SCM,$GCLIENT_URL,`pwd`'])
-    
+
     entries = [tuple(line.split(','))
                for line in results[0].strip().split('\n')]
     logging.debug(entries)
 
     bases = {'svn': self.svn_base, 'git': self.git_base}
     expected_source = [
         ('svn', 'trunk/src/', 'src'),
         ('git', 'repo_1', 'src-git'),
         ('svn', 'trunk/other', 'src/other'),
         ('git', 'repo_2@' + self.githash('repo_2', 1)[:7], 'src/repo2'),
         ('git', 'repo_3', 'src/repo2/repo_renamed'),
         ('svn', 'trunk/third_party/foo@1', 'src/third_party/foo'),
       ]
     expected = [(scm, bases[scm] + url, os.path.join(self.root_dir, path))
                 for (scm, url, path) in expected_source]
 
     self.assertEquals(sorted(entries), sorted(expected))
 
 
 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()