Commit9277ff5

committed

Avoid another tempdir content assumption in test

test_init was using tempfile.gettempdir() directly to get thelocation where the hard-coded path repos/foo/bar.git would be usedto test repository creation with relative and absolute paths. Thatreused the same location each time, and also assumed the directorywould be usable, which could fail due to previous runs or due tothe path being used separately from GitPython's tests. This commitfixes that by using that path inside a temporary directory, knownat the start of the test to be empty.Reorganizing the acquision and cleanup logic also has had theeffect of causing the test no longer to be skipped due to the logicin git.util.rmtree due to the final cleanup attempt (after allassertions). The directory is now successfully removed on Windows,and the test passes on all platforms.

1 parentad570de commit9277ff5Copy full SHA for 9277ff5

File tree

1 file changed

-16

lines changed

test
- test_repo.py

1 file changed

-16

lines changed

`‎test/test_repo.py`

Lines changed: 7 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`UnsafeProtocolError,`
`42`	`42`	`)`
`43`	`43`	`fromgit.repo.funimporttouch`
`44`		`-fromgit.utilimportbin_to_hex,cygpath,join_path_native,rmfile,rmtree`
	`44`	`+fromgit.utilimportbin_to_hex,cwd,cygpath,join_path_native,rmfile,rmtree`
`45`	`45`	`fromtest.libimportTestBase,fixture,with_rw_directory,with_rw_repo`
`46`	`46`
`47`	`47`
`@@ -511,13 +511,11 @@ def write(self, b):`
`511`	`511`	`repo.git.log(n=100,output_stream=TestOutputStream(io.DEFAULT_BUFFER_SIZE))`
`512`	`512`
`513`	`513`	`deftest_init(self):`
`514`		`-prev_cwd=os.getcwd()`
`515`		`-os.chdir(tempfile.gettempdir())`
`516`		`-git_dir_rela="repos/foo/bar.git"`
`517`		`-del_dir_abs=osp.abspath("repos")`
`518`		`-git_dir_abs=osp.abspath(git_dir_rela)`
`519`		`-try:`
`520`		`-# with specific path`
	`514`	`+withtempfile.TemporaryDirectory()astdir,cwd(tdir):`
	`515`	`+git_dir_rela="repos/foo/bar.git"`
	`516`	`+git_dir_abs=osp.abspath(git_dir_rela)`
	`517`	`+`
	`518`	`+# With specific path`
`521`	`519`	`forpathin (git_dir_rela,git_dir_abs):`
`522`	`520`	`r=Repo.init(path=path,bare=True)`
`523`	`521`	`self.assertIsInstance(r,Repo)`
`@@ -527,7 +525,7 @@ def test_init(self):`
`527`	`525`
`528`	`526`	`self._assert_empty_repo(r)`
`529`	`527`
`530`		`-#test clone`
	`528`	`+#Test clone`
`531`	`529`	`clone_path=path+"_clone"`
`532`	`530`	`rc=r.clone(clone_path)`
`533`	`531`	`self._assert_empty_repo(rc)`
`@@ -562,13 +560,6 @@ def test_init(self):`
`562`	`560`	`assertnotr.has_separate_working_tree()`
`563`	`561`
`564`	`562`	`self._assert_empty_repo(r)`
`565`		`-finally:`
`566`		`-try:`
`567`		`-rmtree(del_dir_abs)`
`568`		`-exceptOSError:`
`569`		`-pass`
`570`		`-os.chdir(prev_cwd)`
`571`		`-# END restore previous state`
`572`	`563`
`573`	`564`	`deftest_bare_property(self):`
`574`	`565`	`self.rorepo.bare`

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!

Commit9277ff5

File tree

1 file changed

1 file changed

`‎test/test_repo.py`

0 commit comments