Revision: 3176
Author: pekka.klarck
Date: Wed May 5 03:36:13 2010
Log: small doc enhancements
http://code.google.com/p/robotframework/source/detail?r=3176
Modified:
/trunk/src/robot/libraries/BuiltIn.py
=======================================
--- /trunk/src/robot/libraries/BuiltIn.py Wed May 5 03:04:23 2010
+++ /trunk/src/robot/libraries/BuiltIn.py Wed May 5 03:36:13 2010
@@ -784,7 +784,7 @@
The keyword name and arguments work as in `Run Keyword`. See
`Run Keyword If` for a usage example.
- Starting from Robot Framework 2.5 errors caused by invalid syntax
or
+ Starting from Robot Framework 2.5 errors caused by invalid syntax,
timeouts, or fatal exceptions are not caught by this keyword.
"""
try:
@@ -795,13 +795,17 @@
return 'FAIL', unicode(err)
def run_keyword_and_continue_on_failure(self, name, *args):
- """Runs the keyword and continues even if failure occurs.
-
- The keyword name and arguments work as in `Run Keyword`. See
- `Run Keyword If` for a usage example.
-
- Errors caused by invalid syntax or timeouts, or fatal exceptions
are not
- caught by this keyword."""
+ """Runs the keyword and continues execution even if a failure
occurs.
+
+ The keyword name and arguments work as with `Run Keyword`.
+
+ Example:
+ | Run Keyword And Continue On Failure | Fail | This is a stupid
example |
+ | Log | This keyword is executed |
+
+ This keyword was added in Robot Framework 2.5. Errors caused by
invalid
+ syntax, timeouts, or fatal exceptions are not caught.
+ """
try:
return self.run_keyword(name, *args)
except ExecutionFailed, err:
@@ -827,7 +831,7 @@
| ${msg} = | Run Keyword And Expect Error | * | My KW |
| Should Start With | ${msg} | Once upon a time in |
- Starting from Robot Framework 2.5 errors caused by invalid syntax
or
+ Starting from Robot Framework 2.5 errors caused by invalid syntax,
timeouts, or fatal exceptions are not caught by this keyword.
"""
try:
@@ -888,7 +892,7 @@
Example:
| Wait Until Keyword Succeeds | 2 min | 5 sec | My keyword | arg1
| arg2 |
- Starting from Robot Framework 2.5 errors caused by invalid syntax
or
+ Starting from Robot Framework 2.5 errors caused by invalid syntax,
timeouts, or fatal exceptions are not caught by this keyword.
"""
timeout = utils.timestr_to_secs(timeout)
