summaryrefslogtreecommitdiff
path: root/git/test/test_submodule.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-11-25 17:16:14 +0100
committerSebastian Thiel <byronimo@gmail.com>2010-11-25 17:23:18 +0100
commite86eb305a542cee5b0ff6a0e0352cb458089bf62 (patch)
tree417e020101bcd4b97ff874e28b8a96864b245850 /git/test/test_submodule.py
parentcb68eef0865df6aedbc11cd81888625a70da6777 (diff)
downloadgitpython-e86eb305a542cee5b0ff6a0e0352cb458089bf62.tar.gz
Fixed all testcases
Diffstat (limited to 'git/test/test_submodule.py')
-rw-r--r--git/test/test_submodule.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
index b8a25e02..3a0c5208 100644
--- a/git/test/test_submodule.py
+++ b/git/test/test_submodule.py
@@ -20,7 +20,7 @@ prog = TestRootProgress()
class TestSubmodule(TestBase):
- k_subm_current = "83a9e4a0dad595188ff3fb35bc3dfc4d931eff6d"
+ k_subm_current = "cb68eef0865df6aedbc11cd81888625a70da6777"
k_subm_changed = "394ed7006ee5dc8bddfd132b64001d5dfc0ffdd3"
k_no_subm_tag = "0.1.6"
@@ -40,7 +40,7 @@ class TestSubmodule(TestBase):
# at a different time, there is None
assert len(Submodule.list_items(rwrepo, self.k_no_subm_tag)) == 0
- assert sm.path == 'ext/gitdb'
+ assert sm.path == 'git/ext/gitdb'
assert sm.path != sm.name # in our case, we have ids there, which don't equal the path
assert sm.url == 'git://gitorious.org/git-python/gitdb.git'
assert sm.branch_path == 'refs/heads/master' # the default ...
@@ -184,7 +184,7 @@ class TestSubmodule(TestBase):
sm.update(recursive=True, dry_run=True, progress=prog)
assert not csm.module_exists()
- # update recuesively again
+ # update recursively again
sm.update(recursive=True)
assert csm.module_exists()
@@ -237,6 +237,7 @@ class TestSubmodule(TestBase):
# deletion will fail
# NOTE: As we did a few updates in the meanwhile, the indices were reset
# Hence we create some changes
+ csm.set_parent_commit(csm.repo.head.commit)
sm.config_writer().set_value("somekey", "somevalue")
csm.config_writer().set_value("okey", "ovalue")
self.failUnlessRaises(InvalidGitRepositoryError, sm.remove)