Author: laukpe
Date: Wed Sep 24 10:19:18 2008
New Revision: 827
Modified:
trunk/src/robot/errors.py
trunk/src/robot/utils/error.py
Log:
special error for Remote library to conmmunicate remote errors
(utils.get_error_details ignores its traceback)
Modified: trunk/src/robot/errors.py
==============================================================================
--- trunk/src/robot/errors.py (original)
+++ trunk/src/robot/errors.py Wed Sep 24 10:19:18 2008
@@ -45,5 +45,5 @@
class TimeoutError(RobotError):
"""Used when test execution is timed out"""
-
-
+class RemoteError(RobotError):
+ """Used by Remote library to report remote errors"""
Modified: trunk/src/robot/utils/error.py
==============================================================================
--- trunk/src/robot/utils/error.py (original)
+++ trunk/src/robot/utils/error.py Wed Sep 24 10:19:18 2008
@@ -23,16 +23,16 @@
from match import eq
from robottypes import is_str, unic
-from robot.errors import DataError, TimeoutError
+from robot.errors import DataError, TimeoutError, RemoteError
_java_trace_re = re.compile('^\s+at (\w.+)')
-_ignored_java_trace = ['org.python.', 'robot.running.', 'robot$py.',
- 'sun.reflect.', 'java.lang.reflect.']
+_ignored_java_trace = ('org.python.', 'robot.running.', 'robot$py.',
+ 'sun.reflect.', 'java.lang.reflect.')
_ignore_trace_until =
(os.path.join('robot','running','handlers.py'), '_run_handler')
-_generic_exceptions =
['AssertionError', 'AssertionFailedError', 'Exception',
+_generic_exceptions =
('AssertionError', 'AssertionFailedError', 'Exception',
'Error', 'RuntimeError', 'RuntimeException',
- 'DataError', 'TimeoutError', 'ExecutionFailed']
+ 'DataError', 'TimeoutError', 'ExecutionFailed',
'RemoteError')
def get_error_message():
@@ -130,7 +130,7 @@
def _get_python_details(exc_type, exc_tb):
- if exc_type in [DataError, TimeoutError]:
+ if exc_type in (DataError, RemoteError, TimeoutError):
return ''
tb = traceback.extract_tb(exc_tb)
for row, (path, _, func, _) in enumerate(tb):