Revision: 3131
Author: janne.t.harkonen
Date: Tue May  4 01:04:51 2010
Log: Not required anymore
http://code.google.com/p/robotframework/source/detail?r=3131

Modified:
 /trunk/src/robot/libraries/BuiltIn.py

=======================================
--- /trunk/src/robot/libraries/BuiltIn.py       Mon May  3 09:13:44 2010
+++ /trunk/src/robot/libraries/BuiltIn.py       Tue May  4 01:04:51 2010
@@ -792,7 +792,7 @@
         except ExecutionFailed, err:
             if err.timeout or err.syntax or err.exit:
                 raise
-            return 'FAIL', utils.get_error_message()
+            return 'FAIL', err.msg

     def run_keyword_and_expect_error(self, expected_error, name, *args):
         """Runs the keyword and checks that the expected error occurred.
@@ -887,7 +887,7 @@
                 if err.timeout or err.syntax or err.exit:
                     raise
                 if time.time() > maxtime:
-                    error = utils.get_error_message()
+                    error = err.msg
                 else:
                     time.sleep(retry_interval)
         raise AssertionError("Timeout %s exceeded. The last error was: %s"

Reply via email to