Revision: 3255
Author: janne.t.harkonen
Date: Tue May 11 02:02:33 2010
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=3255
Modified:
/trunk/src/robot/running/keywords.py
=======================================
--- /trunk/src/robot/running/keywords.py Tue May 11 01:57:07 2010
+++ /trunk/src/robot/running/keywords.py Tue May 11 02:02:33 2010
@@ -74,17 +74,20 @@
try:
ret = self._run(handler, context)
context.trace('Return: %s' % utils.safe_repr(ret))
- except ExecutionFailed, err:
+ except ExecutionFailed:
self.status = 'FAIL'
+ self._end(context)
+ raise
else:
if not (context.dry_run and handler.type == 'library'):
self.status = 'PASS'
+ self._end(context)
+ return ret
+
+ def _end(self, context):
self.endtime = utils.get_timestamp()
self.elapsedtime = utils.get_elapsed_time(self.starttime,
self.endtime)
context.end_keyword(self)
- if self.status == 'FAIL':
- raise err
- return ret
def _get_name(self, handler_name, variables):
return handler_name
