Commit 9113177

committed

Don't swallow AttributeError from super().setUp()

This is conceptually independent of the immediately preceding super() call refactoring, but serves the same goal of simplifying and clarifying super() calls. In test.performance.lib, the TestBigRepoR and TestBigRepoRW classes' setUp methods had calls to setUp through super proxies, which were wrapped in try-blocks to swallow AttributeError exceptions. This removes that, relying on the presence of setUp methods in some parent or sibling class in the MRO. The intent appeared to be solely to account for the possibility that no class in the MRO would define a setUp method. However, the unittest.TestCase base class defines noop setUp and tearDown methods to ensure this does not have to be done. This may also make the code more robust, because the form in which AttributeError was being swallowed was: try: super().setUp() except AttributeError: pass But that has the disadvantage of also catching AttributeError due to a bug or other problem in code that runs *in* an ancestor or sibling class's existing setUp method. This could alternatively be addressed by using: try: other_setUp = super().setUp except AttributeError: pass else: other_setUp() However, because unittest.TestCase provides empty setUp and tearDown methods to allow such special-casing to be avoided (both in cases like this and for the test runner), this isn't needed.

1 parent a47e46d commit 9113177Copy full SHA for 9113177

File tree

1 file changed

-8

lines changed

test/performance
- lib.py

1 file changed

-8

lines changed

`‎test/performance/lib.py‎`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,7 @@ class TestBigRepoR(TestBase):`
`32`	`32`	`"""`
`33`	`33`
`34`	`34`	`def setUp(self):`
`35`		`- try:`
`36`		`- super().setUp()`
`37`		`- except AttributeError:`
`38`		`- pass`
	`35`	`+ super().setUp()`
`39`	`36`
`40`	`37`	`repo_path = os.environ.get(k_env_git_repo)`
`41`	`38`	`if repo_path is None:`
`@@ -64,10 +61,7 @@ class TestBigRepoRW(TestBigRepoR):`
`64`	`61`
`65`	`62`	`def setUp(self):`
`66`	`63`	`self.gitrwrepo = None`
`67`		`- try:`
`68`		`- super().setUp()`
`69`		`- except AttributeError:`
`70`		`- pass`
	`64`	`+ super().setUp()`
`71`	`65`	`dirname = tempfile.mktemp()`
`72`	`66`	`os.mkdir(dirname)`
`73`	`67`	`self.gitrwrepo = self.gitrorepo.clone(dirname, shared=True, bare=True, odbt=GitCmdObjectDB)`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 9113177

File tree

1 file changed

1 file changed

`‎test/performance/lib.py‎`

0 commit comments