Cleanup: Merge a bunch of redundent env['GIT_PAGER'] = 'cat' statements.

tests/git_cl_test.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.
 
 """Unit tests for git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 186 matching lines @@
       private_call = [
           ((['git', 'config', 'rietveld.private'],), '')]
 
     return [
         ((['git', 'config', 'core.editor'],), ''),
     ] + cc_call + private_call + [
         ((['git', 'config', 'branch.master.base-url'],), ''),
         ((['git',
            'config', '--local', '--get-regexp', '^svn-remote\\.'],),
          (('', None), 0)),
-        ((['git', 'rev-parse', '--show-cdup'],), ''),
         ((['git', 'svn', 'info'],), ''),
         ((['git',
            'config', 'branch.master.rietveldissue', '1'],), ''),
         ((['git', 'config', 'branch.master.rietveldserver',
            'https://codereview.example.com'],), ''),
         ((['git',
            'config', 'branch.master.rietveldpatchset', '2'],), ''),
         ((['git', 'rev-parse', 'HEAD'],), 'hash'),
         ((['git', 'symbolic-ref', 'HEAD'],), 'hash'),
         ((['git',
@@ skipping 94 matching lines @@
          'config', 'branch.working.rietveldissue'],), '12345'),
       ((['git', 'config', 'branch.working.rietveldserver'],),
          'codereview.example.com'),
       ((['git', 'config', 'rietveld.tree-status-url'],), ''),
       (('GitClHooksBypassedCommit',
         'Issue https://codereview.example.com/12345 bypassed hook when '
         'committing (tree status was "unset")'), None),
   ]
 
   @classmethod
-  def _dcommit_calls_3(cls):
-    return [
+  def _dcommit_calls_3(cls, is_first_call):
+    calls = [
       ((['git',
          'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
          '-l100000', '-C50', 'fake_ancestor_sha',
          'refs/heads/working'],),
        (' PRESUBMIT.py |    2 +-\n'
         ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
       (('About to commit; enter to confirm.',), None),
       ((['git', 'show-ref', '--quiet', '--verify',
          'refs/heads/git-cl-commit'],),
        (('', None), 0)),
       ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
       ((['git', 'show-ref', '--quiet', '--verify',
          'refs/heads/git-cl-cherry-pick'],), ''),
-      ((['git', 'rev-parse', '--show-cdup'],), '\n'),
+    ]
+    if is_first_call:
+      calls += [
+          ((['git', 'rev-parse', '--show-cdup'],), '\n'),
+      ]
+    calls += [
       ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
       ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
       ((['git', 'commit', '-m',
          'Issue: 12345\n\nR=john@chromium.org\n\n'
          'Review URL: https://codereview.example.com/12345'],),
        ''),
       ((['git',
          'svn', 'dcommit', '-C50', '--no-rebase', '--rmdir'],),
        (('', None), 0)),
       ((['git', 'checkout', '-q', 'working'],), ''),
       ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
-  ]
+    ]
+    return calls
 
   @staticmethod
   def _cmd_line(description, args, similarity, find_copies, private):
     """Returns the upload command line passed to upload.RealMain()."""
     return [
         'upload', '--assume_yes', '--server',
         'https://codereview.example.com',
         '--message', description
     ] + args + [
         '--cc', 'joe@example.com',
@@ skipping 142 matching lines @@
           '--similarity.\n',
           stdout.getvalue())
       self.assertEqual(
           'Must specify reviewers to send email.\n', stderr.getvalue())
 
   def test_dcommit(self):
     self.calls = (
         self._dcommit_calls_1() +
         self._git_sanity_checks('fake_ancestor_sha', 'working') +
         self._dcommit_calls_normal() +
-        self._dcommit_calls_3())
+        self._dcommit_calls_3(False))
     git_cl.main(['dcommit'])
 
   def test_dcommit_bypass_hooks(self):
     self.calls = (
         self._dcommit_calls_1() +
         self._dcommit_calls_bypassed() +
-        self._dcommit_calls_3())
+        self._dcommit_calls_3(True))
     git_cl.main(['dcommit', '--bypass-hooks'])
 
 
   @classmethod
   def _gerrit_base_calls(cls):
     return [
         ((['git', 'config', 'rietveld.autoupdate'],),
          ''),
         ((['git',
            'config', 'rietveld.server'],), 'codereview.example.com'),
@@ skipping 203 matching lines @@
       obj = git_cl.ChangeDescription(orig)
       obj.update_reviewers(reviewers)
       actual.append(obj.description)
     self.assertEqual(expected, actual)
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()