Commita8a43fe

committed

Simplify shell test helper with with_exceptions=False

Instead of swallowing GitCommandError exceptions in the helper usedby test_it_uses_shell_or_not_as_specified andtest_it_logs_if_it_uses_a_shell, this modifies the helper so itprevents Git.execute from raising the exception in the first place.

1 parent2d1efdc commita8a43feCopy full SHA for a8a43fe

File tree

1 file changed

-5

lines changed

test
- test_git.py

1 file changed

-5

lines changed

`‎test/test_git.py`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`	`#`
`5`	`5`	`# This module is part of GitPython and is released under`
`6`	`6`	`# the BSD License: https://opensource.org/license/bsd-3-clause/`
`7`		`-importcontextlib`
`8`	`7`	`importinspect`
`9`	`8`	`importlogging`
`10`	`9`	`importos`
`@@ -97,10 +96,8 @@ def _do_shell_combo(self, value_in_call, value_from_class):`
`97`	`96`	`# git.cmd gets Popen via a "from" import, so patch it there.`
`98`	`97`	`withmock.patch.object(cmd,"Popen",wraps=cmd.Popen)asmock_popen:`
`99`	`98`	`# Use a command with no arguments (besides the program name), so it runs`
`100`		`-# with or without a shell, on all OSes, with the same effect. Since git`
`101`		`-# errors out when run with no arguments, we swallow that error.`
`102`		`-withcontextlib.suppress(GitCommandError):`
`103`		`-self.git.execute(["git"],shell=value_in_call)`
	`99`	`+# with or without a shell, on all OSes, with the same effect.`
	`100`	`+self.git.execute(["git"],with_exceptions=False,shell=value_in_call)`
`104`	`101`
`105`	`102`	`returnmock_popen`
`106`	`103`

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!

Commita8a43fe

File tree

1 file changed

1 file changed

`‎test/test_git.py`

0 commit comments