Revision: 3152
Author: jussi.ao.malinen
Date: Tue May 4 06:50:22 2010
Log: cleanup
http://code.google.com/p/robotframework/source/detail?r=3152
Modified:
/trunk/src/robot/running/model.py
/trunk/src/robot/utils/error.py
=======================================
--- /trunk/src/robot/running/model.py Tue May 4 05:32:27 2010
+++ /trunk/src/robot/running/model.py Tue May 4 06:50:22 2010
@@ -108,8 +108,8 @@
if fixture:
try:
fixture.run(output, self.namespace)
- except ExecutionFailed:
- return utils.get_error_message()
+ except ExecutionFailed, err:
+ return unicode(err)
return None
def _run_sub_suites(self, output):
=======================================
--- /trunk/src/robot/utils/error.py Tue May 4 06:40:19 2010
+++ /trunk/src/robot/utils/error.py Tue May 4 06:50:22 2010
@@ -35,8 +35,7 @@
_ignore_trace_until =
(os.path.join('robot','running','handlers.py'), '<lambda>')
_generic_exceptions =
('AssertionError', 'AssertionFailedError', 'Exception',
'Error', 'RuntimeError', 'RuntimeException',
- 'DataError', 'TimeoutError', 'ExecutionFailed',
- 'ExecutionFailures', 'RemoteError')
+ 'DataError', 'TimeoutError', 'RemoteError')
def get_error_message():
@@ -46,8 +45,8 @@
MUST be used to get messages from all exceptions originating outside
the
framework.
"""
- exc_type, exc_value, exc_traceback = sys.exc_info()
- if exc_type in (KeyboardInterrupt, SystemExit):
+ exc_type, exc_value = sys.exc_info()[:2]
+ if exc_type in RERAISED_EXCEPTIONS:
raise exc_value
if _is_java_exception(exc_value):
return _get_java_message(exc_type, exc_value)
