| Index: tests/git_rebase_update_test.py
|
| diff --git a/tests/git_rebase_update_test.py b/tests/git_rebase_update_test.py
|
| index f374948c6463f64453b8f94166b9a105da04a89a..ea12d16c27127d382bc771422adc4a8d46ee5f0c 100755
|
| --- a/tests/git_rebase_update_test.py
|
| +++ b/tests/git_rebase_update_test.py
|
| @@ -6,7 +6,6 @@
|
| """Unit tests for git_rebase_update.py"""
|
|
|
| import os
|
| -import unittest
|
| import sys
|
|
|
| DEPOT_TOOLS_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
| @@ -69,7 +68,6 @@ class GitRebaseUpdateTest(git_test_utils.GitRepoReadWriteTestBase):
|
| self.origin.nuke()
|
| super(GitRebaseUpdateTest, self).tearDown()
|
|
|
| - @unittest.skip('broken by git 2.4')
|
| def testRebaseUpdate(self):
|
| self.repo.git('checkout', 'branch_K')
|
|
|
| @@ -342,4 +340,4 @@ if __name__ == '__main__':
|
| os.path.join(DEPOT_TOOLS_ROOT, 'git_new_branch.py'),
|
| os.path.join(DEPOT_TOOLS_ROOT, 'git_reparent_branch.py'),
|
| os.path.join(DEPOT_TOOLS_ROOT, 'git_rename_branch.py')
|
| - ), required_percentage=85.0))
|
| + )))
|
|
|