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.

Sign up for GitHub

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
Merged

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

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ba4cbae
Split test_refresh into two tests
EliahKagan Jan 24, 2024
f241808
Simplify test of refresh that should succeed
EliahKagan Jan 24, 2024
f98aadd
Have test of refresh that should fail assert command
EliahKagan Jan 24, 2024
24d6067
Fix wrong GitCommandNotFound command from refresh
EliahKagan Jan 24, 2024
3a34dee
Also test refresh with an already-absolute bad path
EliahKagan Jan 24, 2024
5ad7cb2
Start work on making refresh tests restore state
EliahKagan Jan 24, 2024
b3fc30e
Re-refresh to restore state after refresh tests
EliahKagan Jan 25, 2024
ae28c98
Refactor _rollback_refresh slightly for clarity
EliahKagan Jan 25, 2024
3bb63f3
Condense FetchInfo.refresh using contextlib.suppress
EliahKagan Jan 25, 2024
9b7e15f
State what the refresh tests verify
EliahKagan Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Have test of refresh that should fail assert command 
This extends test_refresh_bad_git_path so that it asserts that the
exception message shows the command the failed refresh used.

This test fails due to a bug where "git" is always shown (#1809).
  • Loading branch information
@EliahKagan
EliahKagan committed Jan 24, 2024
commit f98aadddfe390348c2858690fec9577301ea9ba9
6 changes: 5 additions & 1 deletion test/test_git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,11 @@ def test_cmd_override(self):
self.assertRaises(GitCommandNotFound, self.git.version)

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

def test_refresh_good_git_path(self):
path = shutil.which("git")
Expand Down