Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Raise SetupError *after* handling of exceptions raised during _setUp() has completed #33

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Raise SetupError *after* handling of exceptions raised during _setUp() has completed #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions fixtures/fixture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,18 @@ def setUp(self):
else:
details = self.getDetails()
errors = [err] + self.cleanUp(raise_first=False)
try:
raise SetupError(details)
except SetupError:
errors.append(sys.exc_info())
if issubclass(err[0], Exception):
raise MultipleExceptions(*errors)
else:
six.reraise(*err)
else:
return

# If we got here it means we have handled an exception above.
try:
raise SetupError(details)
except SetupError:
errors.append(sys.exc_info())
if issubclass(err[0], Exception):
raise MultipleExceptions(*errors)
else:
six.reraise(*err)

def _setUp(self):
"""Template method for subclasses to override.
Expand Down
4 changes: 4 additions & 0 deletions fixtures/tests/test_fixture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,10 @@ def _setUp(self):
self.assertIsInstance(e.args[0][1], ZeroDivisionError)
self.assertIsInstance(e.args[1][1], fixtures.SetupError)
self.assertEqual('stuff', e.args[1][1].args[0]['log'].as_text())
# The SetupError is not raised during the exception handling of the
# original _setUp exception. We use getattr since __context__ is
# there only for Python 3 exceptions.
self.assertIsNone(getattr(e.args[1][1], "__context__", None))

def test__setUp_fails_cleanUp_fails(self):
# when _setUp fails, cleanups are called, and their failure is captured
Expand Down