Cleanup/enhance skip tests a bit

pekkaklarck · pekkaklarck · commit ac97527a2d01 · 2020-09-29T19:42:37.000+03:00
diff --git a/atest/robot/running/skip.robot b/atest/robot/running/skip.robot
@@ -4,35 +4,36 @@ Resource        atest_resource.robot
 
 *** Test Cases ***
 Skip Keyword
-    Check Test Case     Skip Keyword
+    Check Test Case    ${TEST NAME}
 
 Skip with Library Keyword
-    Check Test Case     Skip with Library Keyword
+    Check Test Case    ${TEST NAME}
 
 Skip Keyword with Custom Message
-    Check Test Case     Skip Keyword with Custom Message
+    Check Test Case    ${TEST NAME}
 
 Skipped in Setup
-    Check Test Case    Skipped in Setup
+    Check Test Case    ${TEST NAME} 1
+    Check Test Case    ${TEST NAME} 2
 
 Skip in Suite Setup
-    Check Test Case    Skipped due to Suite Setup    status=SKIP
+    Check Test Case    ${TEST NAME}
 
 Skip in Directory Suite Setup
-    Check Test Case    Skip in Nested Suite
+    Check Test Case    ${TEST NAME}
 
 Skipped with --skip
-    Check Test Case    Skipped with --skip
+    Check Test Case    ${TEST NAME}
 
 Skipped with --SkipOnFailure
-    Check Test Case    Skipped with --SkipOnFailure
+    Check Test Case    ${TEST NAME}
 
 Using Skip Does Not Affect Passing And Failing Tests
     Check Test Case    Passing Test
     Check Test Case    Failing Test
 
 --NonCritical Is an Alias for --SkipOnFailure
-    Check Test Case    --NonCritical Is an Alias for --SkipOnFailure
+    Check Test Case    ${TEST NAME}
 
 --Critical can be used to override --SkipOnFailure
-    Check Test Case    --Critical can be used to override --SkipOnFailure
+    Check Test Case    ${TEST NAME}
diff --git a/atest/testdata/running/skip/nested/child.robot b/atest/testdata/running/skip/nested/child.robot
@@ -1,4 +1,4 @@
 *** Test Cases ***
-Skip in Nested Suite
+Skip In Directory Suite Setup
     [Documentation]    SKIP Skipped in parent suite setup:\nAll children must be skipped
-    Pass
+    Fail    Should not be executed!
diff --git a/atest/testdata/running/skip/skip.robot b/atest/testdata/running/skip/skip.robot
@@ -5,19 +5,30 @@ Library    skiplib.py
 Skip Keyword
     [Documentation]    SKIP Skipped with Skip keyword.
     Skip
+    Fail    Should not be executed!
 
 Skip with Library Keyword
     [Documentation]    SKIP Show must not got on
     Skip with Message    Show must not got on
+    Fail    Should not be executed!
 
 Skip Keyword with Custom Message
     [Documentation]    SKIP Skipped due to reasons
     Skip    Skipped due to reasons
+    Fail    Should not be executed!
 
-Skipped in Setup
+Skipped in Setup 1
     [Documentation]    SKIP Setup skip
-    [Setup]    Skip     Setup skip
-    Pass
+    [Setup]    Skip    Setup skip
+    Fail    Should not be executed!
+
+Skipped in Setup 2
+    [Documentation]    SKIP Setup skip
+    [Setup]    Run Keywords
+    ...    No Operation    AND
+    ...    Skip    Setup skip    AND
+    ...    Fail    Should not be executed!
+    Fail    Should not be executed!
 
 Skipped with --skip
     [Tags]   skip-this
diff --git a/atest/testdata/running/skip/skip_in_suite_setup.robot b/atest/testdata/running/skip/skip_in_suite_setup.robot
@@ -2,6 +2,6 @@
 Suite Setup    Skip    Cannot go on
 
 *** Test Cases ***
-Skipped Due To Suite Setup
+Skip In Suite Setup
     [Documentation]    SKIP Skipped in parent suite setup:\nCannot go on
-    Pass
+    Fail    Should not be executed!
