From 5feeaba69f7b090d187b7cf4e0ff4f6293369f6a Mon Sep 17 00:00:00 2001 From: Roman Podoliaka Date: Thu, 29 Jan 2015 19:55:47 +0200 Subject: [PATCH] Don't run the test if _setup() fails Change-Id: I2c89c98961044f0e0a1d9b4c2eeea190c5830eed --- migrate/tests/fixture/database.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/migrate/tests/fixture/database.py b/migrate/tests/fixture/database.py index 20ca50a..93bd69b 100644 --- a/migrate/tests/fixture/database.py +++ b/migrate/tests/fixture/database.py @@ -90,9 +90,7 @@ def usedb(supported=None, not_supported=None): log.info('Backend %s is not available, skip it', url) continue except Exception as e: - setup_exception = e - else: - setup_exception = None + raise RuntimeError('Exception during _setup(): %r' % e) try: f(self, *a, **kw) @@ -100,15 +98,7 @@ def usedb(supported=None, not_supported=None): try: self._teardown() except Exception as e: - teardown_exception=e - else: - teardown_exception=None - if setup_exception or teardown_exception: - raise RuntimeError(( - 'Exception during _setup/_teardown:\n' - 'setup: %r\n' - 'teardown: %r\n' - )%(setup_exception,teardown_exception)) + raise RuntimeError('Exception during _teardown(): %r' % e) except Exception: failed_for.append(url) fail = sys.exc_info()