Skip to content

Commit 31537b1

Browse files
pekkaklarckpekkaklarck
committed
Fix skippign suite teardown if setup is skipped or failed.
Fixes robotframework#3896.
1 parent 0b8ee53 commit 31537b1

5 files changed

Lines changed: 41 additions & 1 deletion

File tree

‎atest/robot/running/skip.robot‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ Skip in Directory Suite Setup
7676
Skip In Suite Teardown
7777
Check Test Case ${TEST NAME}
7878

79+
Skip In Suite Setup And Teardown
80+
Check Test Case ${TEST NAME}
81+
82+
Skip In Suite Teardown After Fail In Setup
83+
Check Test Case ${TEST NAME}
84+
7985
Skip In Directory Suite Teardown
8086
Check Test Case ${TEST NAME}
8187

‎atest/testdata/running/skip/skip_in_suite_setup_and_teardown.robot‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
*** Settings ***
2+
Suite Setup Skip Skip me!
3+
Suite Teardown Skip Skip me too!
4+
5+
*** Test Cases ***
6+
Skip In Suite Setup And Teardown
7+
[Documentation] SKIP
8+
... Skipped in parent suite teardown:
9+
... Skip me too!
10+
...
11+
... Earlier message:
12+
... Skipped in parent suite setup:
13+
... Skip me!
14+
Fail Should not be executed.

‎atest/testdata/running/skip/skip_in_suite_teardown.robot‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,10 @@ Suite Teardown Skip Cannot go on
33

44
*** Test Cases ***
55
Skip In Suite Teardown
6-
[Documentation] SKIP Skipped in parent suite teardown:\nCannot go on\n\nEarlier message:\nOh no, a failure
6+
[Documentation] SKIP
7+
... Skipped in parent suite teardown:
8+
... Cannot go on
9+
...
10+
... Earlier message:
11+
... Oh no, a failure
712
Fail Oh no, a failure

‎atest/testdata/running/skip/skip_in_suite_teardown_after_fail_in_setup.robot‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
*** Settings ***
2+
Suite Setup Fail Fail me!
3+
Suite Teardown Skip Skip me!
4+
5+
*** Test Cases ***
6+
Skip In Suite Teardown After Fail In Setup
7+
[Documentation] SKIP
8+
... Skipped in parent suite teardown:
9+
... Skip me!
10+
...
11+
... Earlier message:
12+
... Parent suite setup failed:
13+
... Fail me!
14+
Fail Should not be executed.

‎src/robot/running/status.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ class SuiteMessage(_Message):
306306
teardown_skipped_message = 'Skipped in suite teardown:\n%s'
307307
teardown_message = 'Suite teardown failed:\n%s'
308308
also_teardown_message = '%s\n\nAlso suite teardown failed:\n%s'
309+
also_teardown_skip_message = 'Skipped in suite teardown:\n%s\n\nEarlier message:\n%s'
309310

310311

311312
class ParentMessage(SuiteMessage):

0 commit comments

Comments
 (0)