Bring some OOP and sanity to gclient.py.

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 365 matching lines @@
   def testRunHooksDepsOs(self):
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync', '--deps', 'mac', '--revision', 'src@1'])
     out = self.parseGclient(['runhooks', '--deps', 'mac'], [])
     self.assertEquals([], out)
 
   def testRevInfo(self):
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
-    out = ('src: %(base)s/src@2;\n'
-           'src/other: %(base)s/other@2;\n'
+    out = ('src: %(base)s/src\n'
+           'src/other: %(base)s/other\n'
            'src/third_party/foo: %(base)s/third_party/foo@1\n' %
           { 'base': self.svn_base + 'trunk' })
     self.check((out, '', 0), results)
+    results = self.gclient(['revinfo', '--deps', 'mac', '--actual'])
+    out = ('src: %(base)s/src@2\n'
+           'src/other: %(base)s/other@2\n'
+           'src/third_party/foo: %(base)s/third_party/foo@1\n' %
+          { 'base': self.svn_base + 'trunk' })
+    self.check((out, '', 0), results)
 
 
 class GClientSmokeGIT(GClientSmokeBase):
   def setUp(self):
     GClientSmokeBase.setUp(self)
     self.enabled = self.FAKE_REPOS.setUpGIT()
 
   def testSync(self):
     if not self.enabled:
       return
@@ skipping 154 matching lines @@
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
   def testRevInfo(self):
     if not self.enabled:
       return
     # TODO(maruel): Test multiple solutions.
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     self.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
-    out = ('src: %(base)srepo_1@%(hash1)s;\n'
-           'src/repo2: %(base)srepo_2@%(hash2)s;\n'
+    out = ('src: %(base)srepo_1\n'
+           'src/repo2: %(base)srepo_2@%(hash2)s\n'
+           'src/repo2/repo_renamed: %(base)srepo_3\n' %
+          {
+            'base': self.git_base,
+            'hash1': self.githash('repo_1', 2)[:7],
+            'hash2': self.githash('repo_2', 1)[:7],
+            'hash3': self.githash('repo_3', 2)[:7],
+          })
+    self.check((out, '', 0), results)
+    results = self.gclient(['revinfo', '--deps', 'mac', '--actual'])
+    out = ('src: %(base)srepo_1@%(hash1)s\n'
+           'src/repo2: %(base)srepo_2@%(hash2)s\n'
            'src/repo2/repo_renamed: %(base)srepo_3@%(hash3)s\n' %
           {
             'base': self.git_base,
             'hash1': self.githash('repo_1', 2),
             'hash2': self.githash('repo_2', 1),
             'hash3': self.githash('repo_3', 2),
           })
     self.check((out, '', 0), results)
 
 
 class GClientSmokeBoth(GClientSmokeBase):
   def setUp(self):
     GClientSmokeBase.setUp(self)
     self.FAKE_REPOS.setUpSVN()
     self.enabled = self.FAKE_REPOS.setUpGIT()
 
   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"}]'])
     results = self.gclient(['sync', '--deps', 'mac'])
     # 3x svn checkout, 3x run hooks
     self.checkBlock(results[0],
                     ['running', '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/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',
         'solutions=['
         '{"name": "src",'
         ' "url": "' + self.svn_base + 'trunk/src/"},'
         '{"name": "src-git",'
@@ skipping 20 matching lines @@
     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.gclient(['sync', '--deps', 'mac'])
     results = self.gclient(['revinfo', '--deps', 'mac'])
-    out = ('src: %(svn_base)s/src/@2;\n'
-           'src-git: %(git_base)srepo_1@%(hash1)s;\n'
-           'src/other: %(svn_base)s/other@2;\n'
-           'src/repo2: %(git_base)srepo_2@%(hash2)s;\n'
-           'src/repo2/repo_renamed: %(git_base)srepo_3@%(hash3)s;\n'
+    out = ('src: %(svn_base)s/src/\n'
+           'src-git: %(git_base)srepo_1\n'
+           'src/other: %(svn_base)s/other\n'
+           'src/repo2: %(git_base)srepo_2@%(hash2)s\n'
+           'src/repo2/repo_renamed: %(git_base)srepo_3\n'
            'src/third_party/foo: %(svn_base)s/third_party/foo@1\n') % {
                'svn_base': self.svn_base + 'trunk',
                'git_base': self.git_base,
+               'hash1': self.githash('repo_1', 2)[:7],
+               'hash2': self.githash('repo_2', 1)[:7],
+               'hash3': self.githash('repo_3', 2)[:7],
+          }
+    self.check((out, '', 0), results)
+    results = self.gclient(['revinfo', '--deps', 'mac', '--actual'])
+    out = ('src: %(svn_base)s/src/@2\n'
+           'src-git: %(git_base)srepo_1@%(hash1)s\n'
+           'src/other: %(svn_base)s/other@2\n'
+           'src/repo2: %(git_base)srepo_2@%(hash2)s\n'
+           'src/repo2/repo_renamed: %(git_base)srepo_3@%(hash3)s\n'
+           'src/third_party/foo: %(svn_base)s/third_party/foo@1\n') % {
+               'svn_base': self.svn_base + 'trunk',
+               'git_base': self.git_base,
                'hash1': self.githash('repo_1', 2),
                'hash2': self.githash('repo_2', 1),
                'hash3': self.githash('repo_3', 2),
           }
     self.check((out, '', 0), results)
 
 
 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()