summaryrefslogtreecommitdiff
path: root/git/test/test_submodule.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2015-01-22 17:34:11 +0100
committerSebastian Thiel <byronimo@gmail.com>2015-01-22 17:34:11 +0100
commit66c5b33fb5405fe12756f07048e3bcc3a958b2c1 (patch)
tree044e9a373f1a01d0cef6fa3e0e92e844106db8e1 /git/test/test_submodule.py
parent0ddbe4bc24e634e6496abd3bc6ce3c4377cdf2fb (diff)
downloadgitpython-66c5b33fb5405fe12756f07048e3bcc3a958b2c1.tar.gz
Minor improvements to submodule test for windows portability
However, most tests fail for reasons unknown - SHA cannot be found. For now, I will wait until someone complains, as I doubt too many people will use it on windows. Related to #244
Diffstat (limited to 'git/test/test_submodule.py')
-rw-r--r--git/test/test_submodule.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
index 459e2030..cbf38c18 100644
--- a/git/test/test_submodule.py
+++ b/git/test/test_submodule.py
@@ -689,7 +689,7 @@ class TestSubmodule(TestBase):
@with_rw_directory
def test_git_submodule_compatibility(self, rwdir):
parent = git.Repo.init(os.path.join(rwdir, 'parent'))
- sm_path = 'submodules/intermediate/one'
+ sm_path = join_path_native('submodules', 'intermediate', 'one')
sm = parent.create_submodule('mymodules/myname', sm_path, url=self._small_repo_url())
parent.index.commit("added submodule")
@@ -714,12 +714,12 @@ class TestSubmodule(TestBase):
# end verify submodule 'style'
# test move
- new_sm_path = 'submodules/one'
+ new_sm_path = join_path_native('submodules', 'one')
sm.move(new_sm_path)
assert_exists(sm)
# Add additional submodule level
- csm = sm.module().create_submodule('nested-submodule', 'nested-submodule/working-tree',
+ csm = sm.module().create_submodule('nested-submodule', join_path_native('nested-submodule', 'working-tree'),
url=self._small_repo_url())
sm.module().index.commit("added nested submodule")
sm_head_commit = sm.module().commit()
@@ -781,7 +781,7 @@ class TestSubmodule(TestBase):
sm_mod = sm.module()
if os.path.isfile(os.path.join(sm_mod.working_tree_dir, '.git')) == sm._need_gitfile_submodules(parent.git):
- assert sm_mod.git_dir.endswith(".git/modules/" + new_sm_name)
+ assert sm_mod.git_dir.endswith(join_path_native('.git', 'modules', new_sm_name))
# end
@with_rw_directory