Comments
Patch
@@ -629,17 +629,17 @@ class Test(object):
result.out = out
except KeyboardInterrupt:
updateduration()
log('INTERRUPTED: %s (after %d seconds)' % (self._test,
result.duration))
raise
except Exception, e:
updateduration()
- result.exception = e
+ return self.fail('Exception during execution: %s' % e, 255)
killdaemons(env['DAEMON_PIDS'])
result.refout = self._refout
if not options.keep_tmpdir:
shutil.rmtree(testtmp)
@@ -782,17 +782,16 @@ class Test(object):
class TestResult(object):
"""Holds the result of a test execution."""
def __init__(self):
self.ret = None
self.out = None
self.duration = None
- self.exception = None
self.refout = None
self.skipped = False
class PythonTest(Test):
"""A Python-based test."""
def _run(self, testtmp, replacements, env):
py3kswitch = self._options.py3k_warnings and ' -3' or ''
cmd = '%s%s "%s"' % (PYTHON, py3kswitch, self._path)
@@ -1145,19 +1144,16 @@ def runone(options, test, count):
return skip("unknown test type")
vlog("# Test", test)
t = runner(test, testpath, options, count, ref, err)
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
times.append((test, res.duration))
vlog("# Ret was:", ret)
skipped = res.skipped
refout = res.refout