Skip to content

Commit 9113177

Browse files
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 9113177

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

Diff for: test/performance/lib.py

+2-8
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ class TestBigRepoR(TestBase):
3232
"""
3333

3434
def setUp(self):
35-
try:
36-
super().setUp()
37-
except AttributeError:
38-
pass
35+
super().setUp()
3936

4037
repo_path = os.environ.get(k_env_git_repo)
4138
if repo_path is None:
@@ -64,10 +61,7 @@ class TestBigRepoRW(TestBigRepoR):
6461

6562
def setUp(self):
6663
self.gitrwrepo = None
67-
try:
68-
super().setUp()
69-
except AttributeError:
70-
pass
64+
super().setUp()
7165
dirname = tempfile.mktemp()
7266
os.mkdir(dirname)
7367
self.gitrwrepo = self.gitrorepo.clone(dirname, shared=True, bare=True, odbt=GitCmdObjectDB)

0 commit comments

Comments
 (0)