changeset 21333:9a5913beaf77

run-tests: emit exception failure result from Test.run()
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 19 Apr 2014 21:10:22 -0700
parents 60ce874f5b06
children 6a90ecb6597a
files tests/run-tests.py
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/tests/run-tests.py	Sat Apr 19 21:08:03 2014 -0700
+++ b/tests/run-tests.py	Sat Apr 19 21:10:22 2014 -0700
@@ -636,7 +636,7 @@
             raise
         except Exception, e:
             updateduration()
-            result.exception = e
+            return self.fail('Exception during execution: %s' % e, 255)
 
         killdaemons(env['DAEMON_PIDS'])
 
@@ -789,7 +789,6 @@
         self.ret = None
         self.out = None
         self.duration = None
-        self.exception = None
         self.refout = None
         self.skipped = False
 
@@ -1152,9 +1151,6 @@
     res = TestResult()
     result = t.run(res)
 
-    if res.exception:
-        return t.fail('Exception during execution: %s' % res.exception, 255)
-
     ret = res.ret
     out = res.out