diff options
Diffstat (limited to 'git/test')
| -rw-r--r-- | git/test/test_git.py | 14 | ||||
| -rw-r--r-- | git/test/test_submodule.py | 26 |
2 files changed, 22 insertions, 18 deletions
diff --git a/git/test/test_git.py b/git/test/test_git.py index 7d713022..f97f8130 100644 --- a/git/test/test_git.py +++ b/git/test/test_git.py @@ -162,6 +162,20 @@ class TestGit(TestBase): git_command_version = self.git.version() self.assertEquals(git_version, git_command_version) + def test_persistent_options(self): + git_command_version = self.git.version() + # analog to test_options_are_passed_to_git + self.git.set_persistent_git_options(version=True) + git_version = self.git.NoOp() + self.assertEquals(git_version, git_command_version) + # subsequent calls keep this option: + git_version_2 = self.git.NoOp() + self.assertEquals(git_version_2, git_command_version) + + # reset to empty: + self.git.set_persistent_git_options() + self.assertRaises(GitCommandError, self.git.NoOp) + def test_single_char_git_options_are_passed_to_git(self): input_value = 'TestValue' output_value = self.git(c='user.name=%s' % input_value).config('--get', 'user.name') 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 |