Skip to content

Commit 83f667a

Browse files
yanneyanne
committed
Fix CLI tests after criticality removal
1 parent 510229e commit 83f667a

14 files changed

+18
-64
lines changed

‎atest/robot/cli/console/console_resource.robot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ ${SEP_CHAR1} =
77
${SEP_CHAR2} -
88
${SEP_LINE1} ${SEP_CHAR1 * 78}
99
${SEP_LINE2} ${SEP_CHAR2 * 78}
10-
${MSG_211} 2 critical tests, 1 passed, 1 failed\n2 tests total, 1 passed, 1 failed
11-
${MSG_110} 1 critical test, 1 passed, 0 failed\n1 test total, 1 passed, 0 failed
10+
${MSG_211} 2 tests total, 1 passed, 1 failed
11+
${MSG_110} 1 test total, 1 passed, 0 failed
1212

1313
*** Keywords ***
1414
Create Status Line

‎atest/robot/cli/console/console_type.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Dotted does not show details for skipped
6262
Stderr Should Be empty.txt
6363
Check test tags ${EMPTY}
6464
${tc} = Check test case Empty Test Case FAIL
65-
... Critical failure occurred and exit-on-failure mode is in use.
65+
... Failure occurred and exit-on-failure mode is in use.
6666
Should contain ${tc.tags} robot:exit
6767

6868
*** Keywords ***

‎atest/robot/cli/console/expected_output/dotted_exitonfailure.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Expected
88
Run suite 'Suites' with 11 tests in *.
99

1010
FAILED
11-
11 critical tests, 0 passed, 11 failed
1211
11 tests total, 0 passed, 11 failed
1312

1413
Output: *.xml

‎atest/robot/cli/console/expected_output/dotted_exitonfailure_empty_test.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Test case name cannot be empty.
88
Run suite 'Empty Testcase And Uk' with 9 tests in *.
99

1010
FAILED
11-
9 critical tests, 0 passed, 9 failed
1211
9 tests total, 0 passed, 9 failed
1312

1413
Output: *.xml

‎atest/robot/cli/console/expected_output/dotted_fatal_error.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ FatalCatastrophyException
88
Run suite 'Fatal Exception' with 6 tests in *.
99

1010
FAILED
11-
6 critical tests, 0 passed, 6 failed
1211
6 tests total, 0 passed, 6 failed
1312

1413
Output: *.xml

‎atest/robot/cli/console/expected_output/warnings_and_errors_stdout.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Warning in test case :: Duplicate name causes warning | PASS |
88
Error in test case | PASS |
99
------------------------------------------------------------------------------
1010
Warnings And Errors | PASS |
11-
3 critical tests, 3 passed, 0 failed
1211
3 tests total, 3 passed, 0 failed
1312
==============================================================================
1413
Output: *

‎atest/robot/cli/console/expected_output/warnings_and_errors_stdout_dotted.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Running suite 'Warnings And Errors' with 3 tests.
55
Run suite 'Warnings And Errors' with 3 tests in *.
66

77
PASSED
8-
3 critical tests, 3 passed, 0 failed
98
3 tests total, 3 passed, 0 failed
109

1110
Output: *

‎atest/robot/cli/console/expected_output/warnings_and_errors_stdout_dotted_10.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Expected
1313
Run suite 'Suites & Suites' with 22 tests in *
1414

1515
FAILED
16-
22 critical tests, 20 passed, 2 failed
1716
22 tests total, 20 passed, 2 failed
1817

1918
Output: *

‎atest/robot/cli/rebot/status_rc.robot

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,14 @@ ${NO OUTPUTS} [ ERROR ] No outputs created.\n\nTry --help for usage informa
1313
Zero RC when all tests pass
1414
${EMPTY} ${PASSING} rc=0
1515

16-
Zero RC when all critical tests pass
17-
--critical pass ${FAILING} rc=0
18-
--statusrc -c pass ${FAILING} rc=0
19-
20-
Non-zero RC when critical tests fail
16+
Non-zero RC when tests fail
2117
${EMPTY} ${FAILING} rc=1
2218
--status ${FAILING} rc=1
2319

2420
Zero RC when all tests pass with --NoStatusRC
2521
--NoStatusRC ${PASSING} rc=0
2622

27-
Zero RC when critical tests fail with --NoStatusRC
23+
Zero RC when tests fail with --NoStatusRC
2824
--nostatusrc ${FAILING} rc=0
2925

3026
Error when no output is created

‎atest/robot/cli/runner/debugfile.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Invalid Debugfile
6666
Create Directory %{TEMPDIR}/debug.txt
6767
Run Tests Without Processing Output --outputdir ${CLI OUTDIR} -b %{TEMPDIR}/debug.txt ${TESTFILE}
6868
Stderr Should Match Regexp \\[ ERROR \\] Opening debug file '.*debug.txt' failed: .*
69-
Stdout Should Contain 2 critical tests, 2 passed, 0 failed\n2 tests total, 2 passed, 0 failed
69+
Stdout Should Contain 2 tests total, 2 passed, 0 failed
7070

7171
*** Keywords ***
7272
Debugfile should contain

‎atest/robot/cli/runner/exit_on_failure.robot

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,15 @@ Suite Setup Run Tests
55
Resource atest_resource.robot
66

77
*** Variables ***
8-
${EXIT ON FAILURE} Critical failure occurred and exit-on-failure mode is in use.
8+
${EXIT ON FAILURE} Failure occurred and exit-on-failure mode is in use.
99

1010
*** Test Cases ***
1111
Passing tests do not initiate exit-on-failure
12-
Check Test Case Passing critical
13-
Check Test Case Passing non-critical
12+
Check Test Case Passing
1413
Check Test Case Passing tests do not initiate exit-on-failure
1514

16-
Failing non-critical tests do not initiate exit-on-failure
17-
Check Test Case Failing non-critical
18-
Check Test Case Failing non-critical tests do not initiate exit-on-failure
19-
20-
Failing dynamically non-critical tests do not initiate exit-on-failure
21-
Check Test Case Failing non-critical
22-
Check Test Case Failing dynamically non-critical tests do not initiate exit-on-failure
23-
24-
Failing critical tests initiate exit-on-failure
25-
Check Test Case Failing critical
15+
Failing tests initiate exit-on-failure
16+
Check Test Case Failing
2617
Test Should Have Been Skipped Skipped
2718

2819
Tests in subsequent suites are skipped

‎atest/robot/cli/runner/status_rc.robot

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,15 @@ Zero RC when all tests pass
1111
${EMPTY} ${PASSING} rc=0
1212
--statusrc ${PASSING} rc=0
1313

14-
Zero RC when all critical tests pass
15-
--critical pass ${FAILING} rc=0
16-
-c pass --status ${FAILING} rc=0
17-
18-
Non-zero RC when critical tests fail
14+
Non-zero RC when ests fail
1915
${EMPTY} ${FAILING} rc=1
2016
-r report.html ${FAILING} rc=1
2117
-l log.html --statusrc ${FAILING} rc=1
2218

2319
Zero RC when all tests pass with --NoStatusRC
2420
--NoStatusRC ${PASSING} rc=0
2521

26-
Zero RC when critical tests fail with --NoStatusRC
22+
Zero RC when tests fail with --NoStatusRC
2723
--nostatusrc ${FAILING} rc=0
2824

2925
--StatusRC and --NoStatusRC together

‎atest/testdata/cli/dryrun/run_keyword_variants_in_suite_teardown.robot

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@ Suite Teardown Related Run Keyword Variants
1212
... 2) No keyword with name 'Non Existing' found.
1313
...
1414
... 3) Keyword 'BuiltIn.Log' expected 1 to 6 arguments, got 9.
15-
...
16-
... 4) Keyword 'BuiltIn.Log' expected 1 to 6 arguments, got 0.
1715
No Operation
1816

1917
*** Keywords ***
2018
Run All Suite Teardown Related Run Keyword Variants
21-
Run Keyword If All Critical Tests Passed Log
22-
Run Keyword If Any Critical Tests Failed Non Existing
19+
Run Keyword If All Tests Passed Log
20+
Run Keyword If Any Tests Failed Non Existing
2321
Run Keyword If All Tests Passed Log too many args we have here yes we do
24-
Run Keyword If Any Tests Failed Log

‎atest/testdata/cli/runner/exit_on_failure.robot

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,15 @@
22
Default Tags critical
33

44
*** Test Cases ***
5-
Passing critical
6-
No Operation
7-
8-
Passing non-critical
9-
[Tags] NONE
5+
Passing
106
No Operation
117

128
Passing tests do not initiate exit-on-failure
139
No Operation
1410

15-
Failing non-critical
16-
[Documentation] FAIL Not critical
17-
[Tags] NONE
18-
Fail Not critical
19-
20-
Failing non-critical tests do not initiate exit-on-failure
21-
No Operation
22-
23-
Failing dynamically non-critical
24-
[Documentation] FAIL Criticality removed dynamically
25-
[Setup] Remove Tags critical
26-
Fail Criticality removed dynamically
27-
28-
Failing dynamically non-critical tests do not initiate exit-on-failure
29-
No Operation
30-
31-
Failing critical
32-
[Documentation] FAIL Critical - initiates exit-on-failure
33-
Fail Critical - initiates exit-on-failure
11+
Failing
12+
[Documentation] FAIL initiates exit-on-failure
13+
Fail initiates exit-on-failure
3414

3515
Skipped
3616
Fail Not executed

0 commit comments

Comments
 (0)