[svn r38114] Kill fatals()
to be considered in future --HG-- branch : trunk
This commit is contained in:
parent
1e6016ccc2
commit
cbfca77f39
|
@ -23,17 +23,12 @@ class RunExecutor(object):
|
||||||
def run(self):
|
def run(self):
|
||||||
self.item.run()
|
self.item.run()
|
||||||
|
|
||||||
def fatals(self):
|
|
||||||
return (SystemExit, KeyboardInterrupt)
|
|
||||||
|
|
||||||
def execute(self):
|
def execute(self):
|
||||||
try:
|
try:
|
||||||
self.run()
|
self.run()
|
||||||
outcome = Outcome()
|
outcome = Outcome()
|
||||||
except Skipped, e:
|
except Skipped, e:
|
||||||
outcome = Outcome(skipped=str(e))
|
outcome = Outcome(skipped=str(e))
|
||||||
except self.fatals():
|
|
||||||
raise
|
|
||||||
except:
|
except:
|
||||||
excinfo = py.code.ExceptionInfo()
|
excinfo = py.code.ExceptionInfo()
|
||||||
if isinstance(self.item, py.test.Function):
|
if isinstance(self.item, py.test.Function):
|
||||||
|
@ -84,9 +79,6 @@ class BoxExecutor(RunExecutor):
|
||||||
"""
|
"""
|
||||||
wraps = True
|
wraps = True
|
||||||
|
|
||||||
def fatals(self):
|
|
||||||
return None
|
|
||||||
|
|
||||||
def execute(self):
|
def execute(self):
|
||||||
def fun():
|
def fun():
|
||||||
outcome = RunExecutor.execute(self)
|
outcome = RunExecutor.execute(self)
|
||||||
|
@ -109,9 +101,6 @@ class AsyncExecutor(RunExecutor):
|
||||||
"""
|
"""
|
||||||
wraps = True
|
wraps = True
|
||||||
|
|
||||||
def fatals(self):
|
|
||||||
return None
|
|
||||||
|
|
||||||
def execute(self):
|
def execute(self):
|
||||||
def fun():
|
def fun():
|
||||||
outcome = RunExecutor.execute(self)
|
outcome = RunExecutor.execute(self)
|
||||||
|
|
Loading…
Reference in New Issue