| Index: tests/checkout_test.py
|
| diff --git a/tests/checkout_test.py b/tests/checkout_test.py
|
| index b1dac5e88df915e894bd879364f4dae40b5d5bd9..ca4d4f4c780556f53769e96ee773133cca818009 100755
|
| --- a/tests/checkout_test.py
|
| +++ b/tests/checkout_test.py
|
| @@ -16,7 +16,7 @@ ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
|
| sys.path.append(os.path.join(ROOT_DIR, '..'))
|
|
|
| import checkout
|
| -import pending_manager
|
| +import patch
|
| from tests import fake_repos
|
|
|
|
|
| @@ -121,7 +121,7 @@ class SvnCheckout(BaseTest):
|
| svn_utils_test_path = os.path.join(self.root_dir, 'svn_utils_test.txt')
|
| content = read(svn_utils_test_path)
|
| self.assertTrue(svn_utils_test_path)
|
| - co.apply_patch(pending_manager.auto_mangle_git_patch(GIT_PATCH))
|
| + co.apply_patch(patch.auto_mangle_git_patch(GIT_PATCH))
|
| content_lines = content.splitlines(True)
|
| content_modified = ''.join(
|
| content_lines[0:5] + ['FOO!\n'] + content_lines[5:])
|
| @@ -156,7 +156,7 @@ class SvnCheckout(BaseTest):
|
| svn_utils_test_path = os.path.join(self.root_dir, 'svn_utils_test.txt')
|
| content = read(svn_utils_test_path)
|
| self.assertTrue(svn_utils_test_path)
|
| - co.apply_patch(pending_manager.auto_mangle_git_patch(GIT_PATCH))
|
| + co.apply_patch(patch.auto_mangle_git_patch(GIT_PATCH))
|
| content_lines = content.splitlines(True)
|
| content_modified = ''.join(content_lines[0:5] + ['FOO!\n'] +
|
| content_lines[5:])
|
| @@ -187,7 +187,7 @@ class GitSvnCheckout(BaseTest):
|
| self.assertEquals('pouet', co.get_settings('bar'))
|
| content = read(os.path.join(self.root_dir, 'svn_utils_test.txt'))
|
| self.assertTrue(os.path.join(self.root_dir, 'svn_utils_test.txt'))
|
| - co.apply_patch(pending_manager.auto_mangle_git_patch(GIT_PATCH))
|
| + co.apply_patch(patch.auto_mangle_git_patch(GIT_PATCH))
|
| content_lines = content.splitlines(True)
|
| content_modified = ''.join(content_lines[0:5] + ['FOO!\n'] +
|
| content_lines[5:])
|
|
|