| Index: tests/git_common_test.py
|
| diff --git a/tests/git_common_test.py b/tests/git_common_test.py
|
| index 5ba00b25791c52246f78fdf0751ffcf2c3c1c1d7..5c6febe0d02b897adbd06e2b898bc17587225661 100755
|
| --- a/tests/git_common_test.py
|
| +++ b/tests/git_common_test.py
|
| @@ -230,7 +230,6 @@ class GitReadOnlyFunctionsTest(git_test_utils.GitRepoReadOnlyTestBase,
|
| self.repo.git('checkout', 'branch_D')
|
| self.assertEqual(self.repo.run(self.gc.current_branch), 'branch_D')
|
|
|
| - @unittest.skip('broken by git 2.4')
|
| def testBranches(self):
|
| # This check fails with git 2.4 (see crbug.com/487172)
|
| self.assertEqual(self.repo.run(set, self.gc.branches()),
|
| @@ -448,7 +447,6 @@ class GitMutableStructuredTest(git_test_utils.GitRepoReadWriteTestBase,
|
| self.repo.git('branch', '--set-upstream-to', 'root_A', 'branch_G')
|
| self.repo.git('branch', '--set-upstream-to', 'root_X', 'root_A')
|
|
|
| - @unittest.skip('broken by git 2.4')
|
| def testTooManyBranches(self):
|
| for i in xrange(30):
|
| self.repo.git('branch', 'a'*i)
|
| @@ -535,7 +533,6 @@ class GitMutableStructuredTest(git_test_utils.GitRepoReadWriteTestBase,
|
| self.assertIsNone(
|
| self.repo.run(self.gc.get_or_create_merge_base, 'branch_DOG'))
|
|
|
| - @unittest.skip('broken by git 2.4')
|
| def testGetBranchTree(self):
|
| skipped, tree = self.repo.run(self.gc.get_branch_tree)
|
| # This check fails with git 2.4 (see crbug.com/487172)
|
| @@ -731,6 +728,4 @@ class GitFreezeThaw(git_test_utils.GitRepoReadWriteTestBase):
|
|
|
| if __name__ == '__main__':
|
| sys.exit(coverage_utils.covered_main(
|
| - os.path.join(DEPOT_TOOLS_ROOT, 'git_common.py'),
|
| - required_percentage=88.0
|
| - ))
|
| + os.path.join(DEPOT_TOOLS_ROOT, 'git_common.py')))
|
|
|