Revision: 2514
Author: pekka.klarck
Date: Tue Feb 23 04:35:44 2010
Log: Special handling for test/kw timeouts inside wait_until_kw_succeeds
made possible by the previous commit. Should fix issue 443.
http://code.google.com/p/robotframework/source/detail?r=2514
Modified:
/trunk/src/robot/libraries/BuiltIn.py
=======================================
--- /trunk/src/robot/libraries/BuiltIn.py Tue Feb 23 00:37:55 2010
+++ /trunk/src/robot/libraries/BuiltIn.py Tue Feb 23 04:35:44 2010
@@ -19,7 +19,7 @@
from robot import output
from robot.utils import asserts, get_error_message
-from robot.errors import DataError
+from robot.errors import DataError, ExecutionFailed
from robot import utils
from robot.variables import is_var, is_list_var
from robot.running import Keyword, NAMESPACES, RUN_KW_REGISTER
@@ -879,9 +879,9 @@
while not error:
try:
return self.run_keyword(name, *args)
- except utils.RERAISED_EXCEPTIONS:
- raise
- except:
+ except ExecutionFailed, err:
+ if err.timeouted:
+ raise
if time.time() > maxtime:
error = utils.get_error_message()
else:
