BuiltIn: add Skip If -keyword

yanne · yanne · commit 61f7c519576a · 2020-10-01T14:19:37.000+03:00
diff --git a/atest/robot/running/skip.robot b/atest/robot/running/skip.robot
@@ -9,6 +9,15 @@ Skip Keyword
 Skip with Library Keyword
     Check Test Case    ${TEST NAME}
 
+Skip If Keyword with True Condition
+    Check Test Case    ${TEST NAME}
+
+Skip If Keyword with True Condition And Custom Message
+    Check Test Case    ${TEST NAME}
+
+Skip If Keyword with False Condition
+    Check Test Case    ${TEST NAME}
+
 Skip Keyword with Custom Message
     Check Test Case    ${TEST NAME}
 
diff --git a/atest/testdata/running/skip/skip.robot b/atest/testdata/running/skip/skip.robot
@@ -15,6 +15,19 @@ Skip with Library Keyword
     Skip with Message    Show must not got on
     Fail    Should not be executed!
 
+Skip If Keyword with True Condition
+    [Documentation]    SKIP 1 == 1
+    Skip If    1 == 1
+
+Skip If Keyword with True Condition And Custom Message
+    [Documentation]    SKIP Skipped with abandon.
+    Skip If    1 == 1    Skipped with abandon.
+
+Skip If Keyword with False Condition
+    [Documentation]    FAIL AssertionError
+    Skip If    1 == 2
+    Fail
+
 Skip Keyword with Custom Message
     [Documentation]    SKIP Skipped due to reasons
     Skip    Skipped due to reasons
diff --git a/src/robot/libraries/BuiltIn.py b/src/robot/libraries/BuiltIn.py
@@ -2251,11 +2251,25 @@ def _get_suite_in_teardown(self, kwname):
 class _Control(_BuiltInBase):
 
     def skip(self, msg='Skipped with Skip keyword.'):
-        # TODO: docs
-        """Skip execution of the rest of the current test/task.
+        """Skips the rest of the current test.
+
+        Skips the remaining keywords in the current test and sets the given
+        message to the test. If the test has teardown, it will be executed.
         """
         raise SkipExecution(msg)
 
+    def skip_if(self, condition, msg=None):
+        """Skips the rest of the current test if the ``condition`` is True.
+
+        Skips the remaining keywords in the current test and sets the given
+        message to the test. If ``msg`` is not given, the ``condition`` will
+        be used as the message. If the test has teardown, it will be executed.
+
+        If the ``condition`` evaluates to False, does nothing.
+        """
+        if self._is_true(condition):
+            raise SkipExecution(msg or condition)
+
     def continue_for_loop(self):
         """Skips the current for loop iteration and continues from the next.
 
