Skip to content

Commit e86eb30

Browse files
committed
Fixed all testcases
1 parent cb68eef commit e86eb30

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "gitdb"]
22
path = git/ext/gitdb
3-
url = git://gitorious.org/git-python/gitdb.git
3+
url = git://github.com/Byron/gitdb.git

‎git/ext/gitdb

Submodule gitdb updated from 1bc281d to 9f977b8

‎git/test/lib/helper.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import shutil
1313
import cStringIO
1414

15-
GIT_REPO = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
15+
GIT_REPO = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))
1616

1717
__all__ = (
1818
'fixture_path', 'fixture', 'absolute_project_path', 'StringProcessAdapter',

‎git/test/test_submodule.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def update(self, op, index, max_count, message=''):
2020

2121
class TestSubmodule(TestBase):
2222

23-
k_subm_current = "83a9e4a0dad595188ff3fb35bc3dfc4d931eff6d"
23+
k_subm_current = "cb68eef0865df6aedbc11cd81888625a70da6777"
2424
k_subm_changed = "394ed7006ee5dc8bddfd132b64001d5dfc0ffdd3"
2525
k_no_subm_tag = "0.1.6"
2626

@@ -40,7 +40,7 @@ def _do_base_tests(self, rwrepo):
4040
# at a different time, there is None
4141
assert len(Submodule.list_items(rwrepo, self.k_no_subm_tag)) == 0
4242

43-
assert sm.path == 'ext/gitdb'
43+
assert sm.path == 'git/ext/gitdb'
4444
assert sm.path != sm.name # in our case, we have ids there, which don't equal the path
4545
assert sm.url == 'git://gitorious.org/git-python/gitdb.git'
4646
assert sm.branch_path == 'refs/heads/master' # the default ...
@@ -184,7 +184,7 @@ def _do_base_tests(self, rwrepo):
184184
sm.update(recursive=True, dry_run=True, progress=prog)
185185
assert not csm.module_exists()
186186

187-
# update recuesively again
187+
# update recursively again
188188
sm.update(recursive=True)
189189
assert csm.module_exists()
190190

@@ -237,6 +237,7 @@ def _do_base_tests(self, rwrepo):
237237
# deletion will fail
238238
# NOTE: As we did a few updates in the meanwhile, the indices were reset
239239
# Hence we create some changes
240+
csm.set_parent_commit(csm.repo.head.commit)
240241
sm.config_writer().set_value("somekey", "somevalue")
241242
csm.config_writer().set_value("okey", "ovalue")
242243
self.failUnlessRaises(InvalidGitRepositoryError, sm.remove)

0 commit comments

Comments
 (0)