Fix broken git tests on mac.

tests/git_common_test.py

 #!/usr/bin/env python
 # 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.
 
 """Unit tests for git_common.py"""
 
 import binascii
 import collections
 import os
@@ skipping 315 matching lines @@
       self.repo['B'],
       self.repo['E'],
       self.repo['C'],
     ]))
 
     with self.assertRaisesRegexp(Exception, r"one of \('master', 'bananas'\)"):
       self.repo.run(self.gc.parse_commitrefs, 'master', 'bananas')
 
   def testRepoRoot(self):
     def cd_and_repo_root(path):
-      print(os.getcwd())
       os.chdir(path)
       return self.gc.repo_root()
 
     self.assertEqual(self.repo.repo_path, self.repo.run(self.gc.repo_root))
     # cd to a subdirectory; repo_root should still return the root dir.
     self.assertEqual(self.repo.repo_path,
                      self.repo.run(cd_and_repo_root, 'some/files'))
 
   def testTags(self):
     self.assertEqual(set(self.repo.run(self.gc.tags)),
@@ skipping 295 matching lines @@
 
     self.assertEqual(bottomup, [
       ('branch_L', 'branch_K'),
       ('branch_Z', 'root_X'),
       ('branch_K', 'branch_G'),
       ('branch_G', 'root_A'),
       ('root_A', 'root_X'),
     ])
 
   def testIsGitTreeDirty(self):
-    self.assertEquals(False, self.repo.run(self.gc.is_dirty_git_tree, 'foo'))
+    retval = []
+    self.repo.capture_stdio(
+      lambda: retval.append(self.repo.run(self.gc.is_dirty_git_tree, 'foo')))
+
+    self.assertEquals(False, retval[0])
     self.repo.open('test.file', 'w').write('test data')
     self.repo.git('add', 'test.file')
-    self.assertEquals(True, self.repo.run(self.gc.is_dirty_git_tree, 'foo'))
+
+    retval = []
+    self.repo.capture_stdio(
+      lambda: retval.append(self.repo.run(self.gc.is_dirty_git_tree, 'foo')))
+    self.assertEquals(True, retval[0])
 
   def testSquashBranch(self):
     self.repo.git('checkout', 'branch_K')
 
     self.assertEquals(True, self.repo.run(self.gc.squash_current_branch,
                                           'cool message'))
 
     lines = ['cool message', '']
     for l in 'HIJK':
       lines.extend((self.repo[l], l, ''))
@@ skipping 222 matching lines @@
   def setUp(self):
     self._tempdir = tempfile.mkdtemp()
 
   def tearDown(self):
     shutil.rmtree(self._tempdir)
 
   REPO_SCHEMA = """
   A
   """
 
+  @unittest.skipIf(not hasattr(os, 'symlink'), "OS doesn't support symlink")
   def testMakeWorkdir(self):
-    if not hasattr(os, 'symlink'):
-      return
-
     workdir = os.path.join(self._tempdir, 'workdir')
     self.gc.make_workdir(os.path.join(self.repo.repo_path, '.git'),
                          os.path.join(workdir, '.git'))
     EXPECTED_LINKS = [
         'config', 'info', 'hooks', 'logs/refs', 'objects', 'refs',
     ]
     for path in EXPECTED_LINKS:
       self.assertTrue(os.path.islink(os.path.join(workdir, '.git', path)))
       self.assertEqual(os.path.realpath(os.path.join(workdir, '.git', path)),
                        os.path.join(self.repo.repo_path, '.git', path))
@@ skipping 24 matching lines @@
                       self.repo.show_commit('A', format_string='%cn %ci'))
     self.assertEquals('Author McAuthorly 1970-01-03 00:00:00 +0000',
                       self.repo.show_commit('B', format_string='%an %ai'))
     self.assertEquals('Charles Committish 1970-01-04 00:00:00 +0000',
                       self.repo.show_commit('B', format_string='%cn %ci'))
 
 
 if __name__ == '__main__':
   sys.exit(coverage_utils.covered_main(
     os.path.join(DEPOT_TOOLS_ROOT, 'git_common.py')))