diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-11-18 23:11:26 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-11-18 23:11:26 +0100 |
| commit | 7cf2d5fcf0a3db793678dd6ba9fc1c24d4eeb36a (patch) | |
| tree | 8bd4b8829768fe0195d41a3aa067aa1ac7435605 /test/git/test_submodule.py | |
| parent | ebe8f644e751c1b2115301c1a961bef14d2cce89 (diff) | |
| parent | 9519f186ce757cdba217f222c95c20033d00f91d (diff) | |
| download | gitpython-7cf2d5fcf0a3db793678dd6ba9fc1c24d4eeb36a.tar.gz | |
Merge branch 'refactor' into submodule
Diffstat (limited to 'test/git/test_submodule.py')
| -rw-r--r-- | test/git/test_submodule.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/git/test_submodule.py b/test/git/test_submodule.py index b2b61f39..e7807dcd 100644 --- a/test/git/test_submodule.py +++ b/test/git/test_submodule.py @@ -3,7 +3,8 @@ from test.testlib import * from git.exc import * -from git.objects.submodule import * +from git.objects.submodule.base import Submodule +from git.objects.submodule.root import RootModule from git.util import to_native_path_linux, join_path_native import shutil import git @@ -315,7 +316,6 @@ class TestSubmodule(TestBase): # Error if there is no submodule file here self.failUnlessRaises(IOError, Submodule._config_parser, rwrepo, rwrepo.commit(self.k_no_subm_tag), True) - @with_rw_repo(k_subm_current) def test_base_rw(self, rwrepo): self._do_base_tests(rwrepo) |