summaryrefslogtreecommitdiff
path: root/git/test/test_submodule.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2016-10-22 15:52:26 +0200
committerGitHub <noreply@github.com>2016-10-22 15:52:26 +0200
commit4754fa194360b4648a26b93cdff60d7906eb7f7d (patch)
tree23445fd34bf4b15f125c3ded00f6e6e8079058ff /git/test/test_submodule.py
parentcaa0ea7a0893fe90ea043843d4e6ad407126d7b8 (diff)
parent5fac8d40f535ec8f3d1cf2187fbbe3418d82cf62 (diff)
downloadgitpython-4754fa194360b4648a26b93cdff60d7906eb7f7d.tar.gz
Merge pull request #537 from ankostis/exp_git_dir
FIX #535: expand also GIT_DIR var on Repo-construction
Diffstat (limited to 'git/test/test_submodule.py')
-rw-r--r--git/test/test_submodule.py26
1 files changed, 8 insertions, 18 deletions
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
index fcaad04b..0ebd9ec7 100644
--- a/git/test/test_submodule.py
+++ b/git/test/test_submodule.py
@@ -7,34 +7,24 @@ from unittest.case import skipIf
import git
from git.cmd import Git
-from git.compat import (
- string_types,
- is_win,
-)
+from git.compat import string_types, is_win
from git.exc import (
InvalidGitRepositoryError,
RepositoryDirtyError
)
from git.objects.submodule.base import Submodule
-from git.objects.submodule.root import (
- RootModule,
- RootUpdateProgress,
-)
+from git.objects.submodule.root import RootModule, RootUpdateProgress
from git.repo.fun import (
- find_git_dir,
- touch,
+ find_submodule_git_dir,
+ touch
)
from git.test.lib import (
TestBase,
- with_rw_repo,
+ with_rw_repo
)
from git.test.lib import with_rw_directory
-from git.util import (
- to_native_path_linux,
- join_path_native,
- HIDE_WINDOWS_KNOWN_ERRORS,
-)
-
+from git.util import HIDE_WINDOWS_KNOWN_ERRORS
+from git.util import to_native_path_linux, join_path_native
import os.path as osp
@@ -775,7 +765,7 @@ class TestSubmodule(TestBase):
else:
assert osp.isfile(module_repo_path)
assert sm.module().has_separate_working_tree()
- assert find_git_dir(module_repo_path) is not None, "module pointed to by .git file must be valid"
+ assert find_submodule_git_dir(module_repo_path) is not None, "module pointed to by .git file must be valid"
# end verify submodule 'style'
# test move