Skip to content

Report actual attempted Git command when Git.refresh fails #1812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 26, 2024
Prev Previous commit
Next Next commit
Also test refresh with an already-absolute bad path
  • Loading branch information
EliahKagan committed Jan 24, 2024
commit 3a34dee196c2cfb4873f161d17388847f9f1c1cc
23 changes: 15 additions & 8 deletions test/test_git.py
Original file line number Diff line number Diff line change
Expand Up @@ -306,16 +306,23 @@ def test_cmd_override(self):
):
self.assertRaises(GitCommandNotFound, self.git.version)

def test_refresh_bad_git_path(self):
path = "yada"
escaped_abspath = re.escape(str(Path(path).absolute()))
expected_pattern = rf"\n[ \t]*cmdline: {escaped_abspath}\Z"
def test_refresh_bad_absolute_git_path(self):
absolute_path = str(Path("yada").absolute())
expected_pattern = rf"\n[ \t]*cmdline: {re.escape(absolute_path)}\Z"
with self.assertRaisesRegex(GitCommandNotFound, expected_pattern):
refresh(path)
refresh(absolute_path)

def test_refresh_good_git_path(self):
path = shutil.which("git")
refresh(path)
def test_refresh_bad_relative_git_path(self):
relative_path = "yada"
absolute_path = str(Path(relative_path).absolute())
expected_pattern = rf"\n[ \t]*cmdline: {re.escape(absolute_path)}\Z"
with self.assertRaisesRegex(GitCommandNotFound, expected_pattern):
refresh(relative_path)

def test_refresh_good_absolute_git_path(self):
absolute_path = shutil.which("git")
refresh(absolute_path)
self.assertEqual(self.git.GIT_PYTHON_GIT_EXECUTABLE, absolute_path)

def test_options_are_passed_to_git(self):
# This works because any command after git --version is ignored.
Expand Down