Add options argument to _Run() to redirect output.

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 31 matching lines @@
     cmd = cmd_base + cmd
     process = subprocess.Popen(cmd, cwd=cwd, env=self.env,
                                stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                                shell=sys.platform.startswith('win'))
     (stdout, stderr) = process.communicate()
     logging.debug("XXX: %s\n%s\nXXX" % (' '.join(cmd), stdout))
     logging.debug("YYY: %s\n%s\nYYY" % (' '.join(cmd), stderr))
     return (stdout.replace('\r\n', '\n'), stderr.replace('\r\n', '\n'),
             process.returncode)
 
-  def parseGclient(self, cmd, items):
+  def parseGclient(self, cmd, items, expected_stderr=''):
     """Parse gclient's output to make it easier to test."""
     (stdout, stderr, returncode) = self.gclient(cmd)
-    self.checkString('', stderr)
+    self.checkString(expected_stderr, stderr)
     self.assertEquals(0, returncode)
     return self.checkBlock(stdout, items)
 
   def splitBlock(self, stdout):
     """Split gclient's output into logical execution blocks.
     ___ running 'foo' at '/bar'
     (...)
     ___ running 'baz' at '/bar'
     (...)
 
@@ skipping 30 matching lines @@
     results = self.splitBlock(stdout)
     for i in xrange(min(len(results), len(items))):
       if isinstance(items[i], (list, tuple)):
         verb = items[i][0]
         path = items[i][1]
       else:
         verb = items[i]
         path = self.root_dir
       self.checkString(results[i][0][0], verb, (i, results[i][0][0], verb))
       self.checkString(results[i][0][2], path, (i, results[i][0][2], path))
-    self.assertEquals(len(results), len(items), (stdout, items))
+    self.assertEquals(len(results), len(items), (stdout, items, len(results)))
     return results
 
   def svnBlockCleanup(self, 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:]])
     return out
@@ skipping 349 matching lines @@
   def setUp(self):
     GClientSmokeBase.setUp(self)
     self.enabled = self.FAKE_REPOS.setUpGIT()
 
   def testSync(self):
     if not self.enabled:
       return
     # TODO(maruel): safesync.
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     # Test unversioned checkout.
-    results = self.gclient(['sync', '--deps', 'mac'])
-    self.checkBlock(results[0], ['running', 'running'])
+    self.parseGclient(['sync', '--deps', 'mac'],
+                      ['running', 'running', 'running', '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.
-    #self.assertTrue(results[1].startswith('Switched to a new branch \''))
-    self.assertEquals(0, results[2])
     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'))
@@ skipping 26 matching lines @@
                                 ('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'])
-    results = self.gclient(['sync', '--deps', 'mac', '--revision',
-                            'invalid@' + self.githash('repo_1', 1)])
-    self.checkBlock(results[0], ['running', 'running'])
-    # TODO(maruel): git shouldn't output to stderr...
-    self.checkString('Please fix your script, having invalid --revision flags '
-        'will soon considered an error.\n',
-        results[1])
-    #self.checkString('Please fix your script, having invalid --revision flags '
-    #    'will soon considered an error.\nSwitched to a new branch \'%s\'\n' %
-    #        self.githash('repo_2', 1)[:7],
-    #    results[1])
-    self.assertEquals(0, results[2])
+    self.parseGclient(
+        ['sync', '--deps', 'mac',
+         '--revision', 'invalid@' + self.githash('repo_1', 1)],
+        ['running', 'running', 'running', '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'])
-    results = self.gclient(['sync', '--deps', 'mac',
-                            '--revision', self.githash('repo_1', 1)])
-    self.checkBlock(results[0], [])
-    # TODO(maruel): git shouldn't output to stderr...
-    #self.checkString('Switched to a new branch \'%s\'\n'
-    #    % self.githash('repo_1', 1), results[1])
-    self.checkString('', results[1])
-    self.assertEquals(0, results[2])
+    self.parseGclient(['sync', '--deps', 'mac',
+                       '--revision', self.githash('repo_1', 1)],
+                      ['running', 'running', 'running', 'running'])
     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 testRevertAndStatus(self):
     """TODO(maruel): Remove this line once this test is fixed."""
     if not self.enabled:
       return
     self.gclient(['config', self.git_base + 'repo_1', '--name', 'src'])
     # Tested in testSync.
     self.gclient(['sync', '--deps', 'mac'])
     write(join(self.root_dir, 'src', 'repo2', 'hi'), 'Hey!')
 
-    results = self.gclient(['status', '--deps', 'mac'])
-    out = results[0].splitlines(False)
+    out = self.parseGclient(['status', '--deps', 'mac'], [])
     # TODO(maruel): http://crosbug.com/3584 It should output the unversioned
     # files.
     self.assertEquals(0, len(out))
 
     # Revert implies --force implies running hooks without looking at pattern
     # matching.
     results = self.gclient(['revert', '--deps', 'mac'])
     out = results[0].splitlines(False)
     # TODO(maruel): http://crosbug.com/3583 It just runs the hooks right now.
-    self.assertEquals(7, len(out))
+    self.assertEquals(13, len(out))
     self.checkString('', results[1])
     self.assertEquals(0, results[2])
     tree = self.mangle_git_tree(('repo_1@2', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     # TODO(maruel): http://crosbug.com/3583 This file should have been removed.
     tree[join('src', 'repo2', 'hi')] = 'Hey!'
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
@@ skipping 67 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"}]'])
-    results = self.gclient(['sync', '--deps', 'mac'])
-    # 3x svn checkout, 3x run hooks
-    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/other'),
-                     '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])
+    self.parseGclient(['sync', '--deps', 'mac'],
+        ['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/other'),
+         'running', 'running', 'running', 'running', 'running', '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'
     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"}]'])
-    results = self.gclient(['sync', '--deps', 'mac', '--revision', '1',
-                            '-r', 'src-git@' + self.githash('repo_1', 1)])
-    self.checkBlock(results[0], ['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])
+    self.parseGclient(
+        ['sync', '--deps', 'mac', '--revision', '1',
+         '-r', 'src-git@' + self.githash('repo_1', 1)],
+        ['running', 'running', 'running', 'running',
+         'running', 'running', 'running', 'running'])
     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'),
         ('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)
@@ skipping 152 matching lines @@
 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()