Commitb3fc30e

committed

Re-refresh to restore state after refresh tests

For#1811. This is the simple way to do it. This relies ongit.refresh working when called when no arguments, so if that everbreaks, then it may be difficult or inefficient to investigate. Butthis is simpler than any alternatives that are equally or morerobust.This is already better than the previous incomplete way that onlyrestored Git.GIT_PYTHON_GIT_EXECUTABLE (and nothing in FetchInfo).Furthermore, because the tests already depend to a large extent ongit.refreh working when called with no arguments, as otherwise theinitial refresh may not have set Git.GIT_PYTHON_GIT_EXECUTABLEusably, it might not be worthwhile to explore other approaches.

1 parent5ad7cb2 commitb3fc30eCopy full SHA for b3fc30e

File tree

1 file changed

-7

lines changed

test
- test_git.py

1 file changed

-7

lines changed

`‎test/test_git.py`

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,12 @@ def _patch_out_env(name):`
`45`	`45`
`46`	`46`
`47`	`47`	`@contextlib.contextmanager`
`48`		`-def_restore_git_executable():`
	`48`	`+def_rollback_refresh():`
`49`	`49`	`old_git_executable=Git.GIT_PYTHON_GIT_EXECUTABLE`
`50`	`50`	`try:`
`51`		`-yieldold_git_executable# Let test code run that mayrebind the attribute.`
	`51`	`+yieldold_git_executable# Let test code run that maymutate class state.`
`52`	`52`	`finally:`
`53`		`-Git.GIT_PYTHON_GIT_EXECUTABLE=old_git_executable`
	`53`	`+refresh()`
`54`	`54`
`55`	`55`
`56`	`56`	`@ddt.ddt`
`@@ -319,7 +319,7 @@ def test_refresh_bad_absolute_git_path(self):`
`319`	`319`	`absolute_path=str(Path("yada").absolute())`
`320`	`320`	`expected_pattern=rf"\n[ \t]*cmdline:{re.escape(absolute_path)}\Z"`
`321`	`321`
`322`		`-with_restore_git_executable()asold_git_executable:`
	`322`	`+with_rollback_refresh()asold_git_executable:`
`323`	`323`	`withself.assertRaisesRegex(GitCommandNotFound,expected_pattern):`
`324`	`324`	`refresh(absolute_path)`
`325`	`325`	`self.assertEqual(self.git.GIT_PYTHON_GIT_EXECUTABLE,old_git_executable)`
`@@ -328,15 +328,15 @@ def test_refresh_bad_relative_git_path(self):`
`328`	`328`	`absolute_path=str(Path("yada").absolute())`
`329`	`329`	`expected_pattern=rf"\n[ \t]*cmdline:{re.escape(absolute_path)}\Z"`
`330`	`330`
`331`		`-with_restore_git_executable()asold_git_executable:`
	`331`	`+with_rollback_refresh()asold_git_executable:`
`332`	`332`	`withself.assertRaisesRegex(GitCommandNotFound,expected_pattern):`
`333`	`333`	`refresh("yada")`
`334`	`334`	`self.assertEqual(self.git.GIT_PYTHON_GIT_EXECUTABLE,old_git_executable)`
`335`	`335`
`336`	`336`	`deftest_refresh_good_absolute_git_path(self):`
`337`	`337`	`absolute_path=shutil.which("git")`
`338`	`338`
`339`		`-with_restore_git_executable():`
	`339`	`+with_rollback_refresh():`
`340`	`340`	`refresh(absolute_path)`
`341`	`341`	`self.assertEqual(self.git.GIT_PYTHON_GIT_EXECUTABLE,absolute_path)`
`342`	`342`
`@@ -345,7 +345,7 @@ def test_refresh_good_relative_git_path(self):`
`345`	`345`	`dirname,basename=osp.split(absolute_path)`
`346`	`346`
`347`	`347`	`withcwd(dirname):`
`348`		`-with_restore_git_executable():`
	`348`	`+with_rollback_refresh():`
`349`	`349`	`refresh(basename)`
`350`	`350`	`self.assertEqual(self.git.GIT_PYTHON_GIT_EXECUTABLE,absolute_path)`
`351`	`351`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitb3fc30e

File tree

1 file changed

1 file changed

`‎test/test_git.py`

0 commit comments