git_cl sanity checks

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 79 matching lines @@
         '@%d  Expected: %r   Actual: %r' % (
           self._calls_done, expected_args, args))
     self._calls_done += 1
     return result
 
   @classmethod
   def _upload_calls(cls, similarity, find_copies):
     return (cls._git_base_calls(similarity, find_copies) +
             cls._git_upload_calls())
 
-  @staticmethod
-  def _git_base_calls(similarity, find_copies):
+  @classmethod
+  def _git_base_calls(cls, similarity, find_copies):
     if similarity is None:
       similarity = '50'
       similarity_call = ((['git', 'config', '--int', '--get',
                          'branch.master.git-cl-similarity'],), '')
     else:
       similarity_call = ((['git', 'config', '--int',
                          'branch.master.git-cl-similarity', similarity],), '')
 
     if find_copies is None:
       find_copies = True
       find_copies_call = ((['git', 'config', '--int', '--get',
                           'branch.master.git-find-copies'],), '')
     else:
       val = str(int(find_copies))
       find_copies_call = ((['git', 'config', '--int',
                           'branch.master.git-find-copies', val],), '')
 
     if find_copies:
       stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
                    '--find-copies-harder', '-l100000', '-C'+similarity,
-                   'master...'],), '+dat')
+                   'fake_ancestor_sha'],), '+dat')
     else:
       stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
-                   '-M'+similarity, 'master...'],), '+dat')
+                   '-M'+similarity, 'fake_ancestor_sha'],), '+dat')
 
     return [
       ((['git', 'config', 'gerrit.host'],), ''),
       ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
       ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
       similarity_call,
       ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
       find_copies_call,
       ((['git', 'update-index', '--refresh', '-q'],), ''),
       ((['git', 'diff-index', '--name-status', 'HEAD'],), ''),
       ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
       ((['git', 'config', 'branch.master.merge'],), 'master'),
       ((['git', 'config', 'branch.master.remote'],), 'origin'),
+      ((['git', 'merge-base', 'master', 'HEAD'],), 'fake_ancestor_sha'),
+      ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
       ((['git', 'rev-parse', '--show-cdup'],), ''),
       ((['git', 'rev-parse', 'HEAD'],), '12345'),
-      ((['git', 'diff', '--name-status', '-r', 'master...', '.'],),
+      ((['git', 'diff', '--name-status', '-r', 'fake_ancestor_sha...', '.'],),
         'M\t.gitignore\n'),
       ((['git', 'config', 'branch.master.rietveldissue'],), ''),
       ((['git', 'config', 'branch.master.rietveldpatchset'],), ''),
-      ((['git', 'log', '--pretty=format:%s%n%n%b', 'master...'],), 'foo'),
+      ((['git', 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
+       'foo'),
       ((['git', 'config', 'user.email'],), 'me@example.com'),
       stat_call,
-      ((['git', 'log', '--pretty=format:%s\n\n%b', 'master..'],), 'desc\n'),
+      ((['git', 'log', '--pretty=format:%s\n\n%b', 'fake_ancestor_sha..'],),
+       'desc\n'),
     ]
 
-  @staticmethod
-  def _git_upload_calls():
+  @classmethod
+  def _git_upload_calls(cls):
     return [
       ((['git', 'config', 'rietveld.cc'],), ''),
       ((['git', 'config', 'branch.master.base-url'],), ''),
       ((['git', 'config', '--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'],), ''),
     ]
 
+  @staticmethod
+  def _git_sanity_checks(diff_base, working_branch):
+    fake_ancestor = 'fake_ancestor'
+    fake_cl = 'fake_cl_for_patch'
+    return [
+      # Calls to verify branch point is ancestor
+      ((['git', 'rev-parse', '--verify', diff_base],), fake_ancestor),
+      ((['git', 'merge-base', fake_ancestor, 'HEAD'],), fake_ancestor),
+      ((['git', 'rev-list', '^' + fake_ancestor, 'HEAD'],), fake_cl),
+      # Mock a config miss (error code 1)
+      ((['git', 'config', 'depottools.remotebranch'],), (((''), None), 1)),

[iannucci, 2012/11/02 00:30:05]

Too much parens!

[Isaac (away), 2012/11/02 00:50:03]

Nice catch, done.

+      # Call to GetRemoteBranch()
+      ((['git', 'config', 'branch.%s.merge' % working_branch],),
+       'refs/heads/master'),
+      ((['git', 'config', 'branch.%s.remote' % working_branch],), 'origin'),
+      ((['git', 'rev-list', '^' + fake_ancestor,
+         'refs/remotes/origin/master'],), ''),
+       ]
+
   @classmethod
   def _dcommit_calls_1(cls):
     return [
       ((['git', 'config', '--get-regexp', '^svn-remote\\.'],),
        ((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
           'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
          None),
         0)),
       ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
       ((['git', 'symbolic-ref', 'HEAD'],), 'refs/heads/working'),
@@ skipping 10 matching lines @@
          'refs/remotes/origin/master^!'],), ''),
       ((['git', 'update-index', '--refresh', '-q'],), ''),
       ((['git', 'diff-index', '--name-status', 'HEAD'],), ''),
       ((['git', 'rev-list', '^refs/heads/working',
          'refs/remotes/origin/master'],),
          ''),
       ((['git', 'log', '--grep=^git-svn-id:', '-1', '--pretty=format:%H'],),
          '3fc18b62c4966193eb435baabe2d18a3810ec82e'),
       ((['git', 'rev-list', '^3fc18b62c4966193eb435baabe2d18a3810ec82e',
          'refs/remotes/origin/master'],), ''),
+      ((['git', 'merge-base', 'refs/remotes/origin/master', 'HEAD'],),
+       'fake_ancestor_sha'),
     ]
 
   @classmethod
   def _dcommit_calls_normal(cls):
     return [
       ((['git', 'rev-parse', '--show-cdup'],), ''),
       ((['git', 'rev-parse', 'HEAD'],),
           '00ff397798ea57439712ed7e04ab96e13969ef40'),
-      ((['git', 'diff', '--name-status', '-r', 'refs/remotes/origin/master...',
+      ((['git', 'diff', '--name-status', '-r', 'fake_ancestor_sha...',
          '.'],),
         'M\tPRESUBMIT.py'),
       ((['git', 'config', 'branch.working.rietveldissue'],), '12345'),
       ((['git', 'config', 'branch.working.rietveldpatchset'],), '31137'),
       ((['git', 'config', 'branch.working.rietveldserver'],),
          'codereview.example.com'),
       ((['git', 'config', 'user.email'],), 'author@example.com'),
       ((['git', 'config', 'rietveld.tree-status-url'],), ''),
   ]
 
   @classmethod
   def _dcommit_calls_bypassed(cls):
     return [
       ((['git', 'config', 'branch.working.rietveldissue'],), '12345'),
       ((['git', 'config', 'branch.working.rietveldserver'],),
          'codereview.example.com'),
       (('GitClHooksBypassedCommit',
         'Issue https://codereview.example.com/12345 bypassed hook when '
         'committing'), None),
   ]
 
   @classmethod
   def _dcommit_calls_3(cls):
     return [
       ((['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
-         '-l100000', '-C50', 'refs/remotes/origin/master',
+         '-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'),
       ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
-      ((['git', 'reset', '--soft', 'refs/remotes/origin/master'],), ''),
+      ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
       ((['git', 'commit', '-m',
          'Issue: 12345\n\nReview 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'],), ''),
   ]
 
   @staticmethod
   def _cmd_line(description, args, similarity, find_copies):
     """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',
         '--git_similarity', similarity or '50'
     ] + (['--git_no_find_copies'] if find_copies == False else []) + [
-        'master...'
+        'fake_ancestor_sha'
     ]
 
   def _run_reviewer_test(
       self,
       upload_args,
       expected_description,
       returned_description,
       final_description,
       reviewers):
     """Generic reviewer test framework."""
@@ skipping 109 matching lines @@
       self.mock(sys, 'stderr', mock)
       git_cl.main(['upload', '--send-mail'])
       self.fail()
     except SystemExit:
       self.assertEquals(
           'Must specify reviewers to send email.\n', mock.buf.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())
     git_cl.main(['dcommit'])
 
   def test_dcommit_bypass_hooks(self):
     self.calls = (
         self._dcommit_calls_1() +
         self._dcommit_calls_bypassed() +
         self._dcommit_calls_3())
     git_cl.main(['dcommit', '--bypass-hooks'])
 
 
-  @staticmethod
-  def _gerrit_base_calls():
+  @classmethod
+  def _gerrit_base_calls(cls):
     return [
         ((['git', 'config', 'gerrit.host'],), 'gerrit.example.com'),
         ((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
         ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
         ((['git', 'config', '--int', '--get',
           'branch.master.git-cl-similarity'],), ''),
         ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
         ((['git', 'config', '--int', '--get',
           'branch.master.git-find-copies'],), ''),
         ((['git', 'update-index', '--refresh', '-q'],), ''),
         ((['git', 'diff-index', '--name-status', 'HEAD'],), ''),
         ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
         ((['git', 'config', 'branch.master.merge'],), 'master'),
         ((['git', 'config', 'branch.master.remote'],), 'origin'),
+        ((['git', 'merge-base', 'master', 'HEAD'],), 'fake_ancestor_sha'),
+        ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [
         ((['git', 'rev-parse', '--show-cdup'],), ''),
         ((['git', 'rev-parse', 'HEAD'],), '12345'),
-        ((['git', 'diff', '--name-status', '-r', 'master...', '.'],),
+        ((['git', 'diff', '--name-status', '-r', 'fake_ancestor_sha...', '.'],),
          'M\t.gitignore\n'),
         ((['git', 'config', 'branch.master.rietveldissue'],), ''),
         ((['git', 'config', 'branch.master.rietveldpatchset'],), ''),
-        ((['git', 'log', '--pretty=format:%s%n%n%b', 'master...'],), 'foo'),
+        ((['git', 'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
+         'foo'),
         ((['git', 'config', 'user.email'],), 'me@example.com'),
         ((['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
-           '-l100000', '-C50', 'master...'],),
+           '-l100000', '-C50', 'fake_ancestor_sha'],),
          '+dat'),
         ]
 
   @staticmethod
   def _gerrit_upload_calls(description, reviewers):
     calls = [
-        ((['git', 'log', '--pretty=format:%s\n\n%b', 'master..'],),
+        ((['git', 'log', '--pretty=format:%s\n\n%b', 'fake_ancestor_sha..'],),
          description)
         ]
     if git_cl.CHANGE_ID not in description:
       calls += [
-          ((['git', 'log', '--pretty=format:%s\n\n%b', 'master..'],),
+          ((['git', 'log', '--pretty=format:%s\n\n%b', 'fake_ancestor_sha..'],),
            description),
           ((['git', 'commit', '--amend', '-m', description],),
            ''),
-          ((['git', 'log', '--pretty=format:%s\n\n%b', 'master..'],),
+          ((['git', 'log', '--pretty=format:%s\n\n%b', 'fake_ancestor_sha..'],),
            description)
           ]
     calls += [
         ((['git', 'config', 'rietveld.cc'],), '')
         ]
     receive_pack = '--receive-pack=git receive-pack '
     receive_pack += '--cc=joe@example.com'  # from watch list
     if reviewers:
       receive_pack += ' '
       receive_pack += ' '.join(['--reviewer=' + email for email in reviewers])
@@ skipping 92 matching lines @@
         ((['git', 'config', 'rietveld.viewvc-url'],), ''),
         (('ViewVC URL:',), ''),
         # DownloadHooks(True)
         ((commit_msg_path, os.X_OK,), True),
         ]
     git_cl.main(['config'])
 
 
 if __name__ == '__main__':
   unittest.main()