Revision: 3144
Author: KariHusa
Date: Tue May 4 04:39:09 2010
Log: Use new api
http://code.google.com/p/robotframework/source/detail?r=3144
Modified:
/trunk/src/robot/libraries/BuiltIn.py
=======================================
--- /trunk/src/robot/libraries/BuiltIn.py Tue May 4 01:04:51 2010
+++ /trunk/src/robot/libraries/BuiltIn.py Tue May 4 04:39:09 2010
@@ -792,7 +792,7 @@
except ExecutionFailed, err:
if err.timeout or err.syntax or err.exit:
raise
- return 'FAIL', err.msg
+ return 'FAIL', unicode(err)
def run_keyword_and_expect_error(self, expected_error, name, *args):
"""Runs the keyword and checks that the expected error occurred.
@@ -823,10 +823,10 @@
else:
raise AssertionError("Expected error '%s' did not occur"
% expected_error)
- if not self._matches(err.msg, expected_error):
+ if not self._matches(unicode(err), expected_error):
raise AssertionError("Expected error '%s' but got '%s'"
- % (expected_error, err.msg))
- return err.msg
+ % (expected_error, err))
+ return unicode(err)
def repeat_keyword(self, times, name, *args):
"""Executes the specified keyword multiple times.
@@ -887,7 +887,7 @@
if err.timeout or err.syntax or err.exit:
raise
if time.time() > maxtime:
- error = err.msg
+ error = unicode(err)
else:
time.sleep(retry_interval)
raise AssertionError("Timeout %s exceeded. The last error was: %s"
