Minor improvements to submodule test for windows portability

Byron · Byron · commit 66c5b33fb540 · 2015-01-22T17:34:11.000+01:00
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 gitpython-developers#244
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
@@ -689,7 +689,7 @@ def test_git_submodules(self, rwdir):
     @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 @@ def assert_exists(sm, value=True):
         # 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 @@ def test_rename(self, rwdir):
 
         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
