Add git-reup and friends

testing_support/git_test_utils.py

 # Copyright 2013 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.
 
 import atexit
 import collections
 import copy
 import datetime
 import hashlib
 import os
 import shutil
 import subprocess
+import sys
 import tempfile
 import unittest
 
+from cStringIO import StringIO
+
 
 def git_hash_data(data, typ='blob'):
   """Calculate the git-style SHA1 for some data.
 
   Only supports 'blob' type data at the moment.
   """
   assert typ == 'blob', 'Only support blobs for now'
   return hashlib.sha1('blob %s\0%s' % (len(data), data)).hexdigest()
 
 
@@ skipping 225 matching lines @@
     """
     self.repo_path = tempfile.mkdtemp(dir=self.BASE_TEMP_DIR)
     self.commit_map = {}
     self._date = datetime.datetime(1970, 1, 1)
 
     self.git('init')
     for commit in schema.walk():
       self._add_schema_commit(commit, schema.data_for(commit.name))
       self.last_commit = self[commit.name]
     if schema.master:
-      self.git('update-ref', 'master', self[schema.master])
+      self.git('update-ref', 'refs/heads/master', self[schema.master])
 
   def __getitem__(self, commit_name):
     """Gets the hash of a commit by its schema name.
 
     >>> r = GitRepo(GitRepoSchema('A B C'))
     >>> r['B']
     '7381febe1da03b09da47f009963ab7998a974935'
     """
     return self.commit_map[commit_name]
 
@@ skipping 75 matching lines @@
     """Run a python function with the given args and kwargs with the cwd set to
     the git repo."""
     assert self.repo_path is not None
     curdir = os.getcwd()
     try:
       os.chdir(self.repo_path)
       return fn(*args, **kwargs)
     finally:
       os.chdir(curdir)
 
+  def capture_stdio(self, fn, *args, **kwargs):
+    """Run a python function with the given args and kwargs with the cwd set to
+    the git repo.
+
+    Returns the (stdout, stderr) of whatever ran, instead of the what |fn|
+    returned.
+    """
+    stdout = sys.stdout
+    stderr = sys.stderr
+    try:
+      sys.stdout = StringIO()
+      sys.stderr = StringIO()
+      self.run(fn, *args, **kwargs)
+      return sys.stdout.getvalue(), sys.stderr.getvalue()
+    finally:
+      sys.stdout = stdout
+      sys.stderr = stderr
+
 
 class GitRepoSchemaTestBase(unittest.TestCase):
   """A TestCase with a built-in GitRepoSchema.
 
-  Expects a class variable REPO to be a GitRepoSchema string in the form
+  Expects a class variable REPO_SCHEMA to be a GitRepoSchema string in the form
   described by that class.
 
   You may also set class variables in the form COMMIT_%(commit_name)s, which
   provide the content for the given commit_name commits.
 
   You probably will end up using either GitRepoReadOnlyTestBase or
   GitRepoReadWriteTestBase for real tests.
   """
-  REPO = None
+  REPO_SCHEMA = None
 
   @classmethod
   def getRepoContent(cls, commit):
     return getattr(cls, 'COMMIT_%s' % commit, None)
 
   @classmethod
   def setUpClass(cls):
     super(GitRepoSchemaTestBase, cls).setUpClass()
-    assert cls.REPO is not None
-    cls.r_schema = GitRepoSchema(cls.REPO, cls.getRepoContent)
+    assert cls.REPO_SCHEMA is not None
+    cls.r_schema = GitRepoSchema(cls.REPO_SCHEMA, cls.getRepoContent)
 
 
 class GitRepoReadOnlyTestBase(GitRepoSchemaTestBase):
   """Injects a GitRepo object given the schema and content from
   GitRepoSchemaTestBase into TestCase classes which subclass this.
 
   This GitRepo will appear as self.repo, and will be deleted and recreated once
   for the duration of all the tests in the subclass.
   """
-  REPO = None
+  REPO_SCHEMA = None
 
   @classmethod
   def setUpClass(cls):
     super(GitRepoReadOnlyTestBase, cls).setUpClass()
-    assert cls.REPO is not None
+    assert cls.REPO_SCHEMA is not None
     cls.repo = cls.r_schema.reify()
 
   def setUp(self):
     self.repo.git('checkout', '-f', self.repo.last_commit)
 
   @classmethod
   def tearDownClass(cls):
     cls.repo.nuke()
     super(GitRepoReadOnlyTestBase, cls).tearDownClass()
 
 
 class GitRepoReadWriteTestBase(GitRepoSchemaTestBase):
   """Injects a GitRepo object given the schema and content from
   GitRepoSchemaTestBase into TestCase classes which subclass this.
 
   This GitRepo will appear as self.repo, and will be deleted and recreated for
   each test function in the subclass.
   """
-  REPO = None
+  REPO_SCHEMA = None
 
   def setUp(self):
     super(GitRepoReadWriteTestBase, self).setUp()
     self.repo = self.r_schema.reify()
 
   def tearDown(self):
     self.repo.nuke()
     super(GitRepoReadWriteTestBase, self).tearDown()