summaryrefslogtreecommitdiff
path: root/scripts/LocalDriver.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-06-01 16:39:36 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-06-01 16:39:36 +0200
commit19f02b22c30d0c8e84cdc8faf90adab00021d871 (patch)
tree69ba99b58ffe34d56baa336ed9428262b8f08670 /scripts/LocalDriver.py
parentPriority inverstion test fixes (diff)
downloadice-19f02b22c30d0c8e84cdc8faf90adab00021d871.tar.bz2
ice-19f02b22c30d0c8e84cdc8faf90adab00021d871.tar.xz
ice-19f02b22c30d0c8e84cdc8faf90adab00021d871.zip
Fixed ICE-7951 - don't ignore exceptions from testsuite setup/teardown
Diffstat (limited to 'scripts/LocalDriver.py')
-rw-r--r--scripts/LocalDriver.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py
index 7263675b0ca..1bb23236b3d 100644
--- a/scripts/LocalDriver.py
+++ b/scripts/LocalDriver.py
@@ -436,7 +436,12 @@ class LocalDriver(Driver):
current.testsuite))
success = False
try:
- current.testsuite.setup(current)
+ try:
+ current.testsuite.setup(current)
+ except Exception as ex:
+ current.result.writeln(traceback.format_exc())
+ raise
+
for testcase in current.testsuite.getTestCases():
config = current.config
try:
@@ -451,7 +456,11 @@ class LocalDriver(Driver):
current.config = config
success = True
finally:
- current.testsuite.teardown(current, success)
+ try:
+ current.testsuite.teardown(current, success)
+ except Exception as ex:
+ current.result.writeln(traceback.format_exc())
+ raise
def runClientServerTestCase(self, current):