Skip to content

Commit 793dd63

Browse files
yanneyanne
committed
Fix/remove acceptance tests after criticality removal
1 parent d30a3cb commit 793dd63

File tree

11 files changed

+10
-68
lines changed

11 files changed

+10
-68
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Suite setup fails
6262
[Setup] Run Tests
6363
... --ExitOnFail --variable SUITE_SETUP:Fail
6464
... misc/setups_and_teardowns.robot misc/pass_and_fail.robot
65-
Check Test Case Test with setup and teardown FAIL Parent suite setup failed:\nAssertionError
65+
Test Should Have Been Skipped Test with setup and teardown
6666
Test Should Have Been Skipped Test with failing setup
6767
Test Should Have Been Skipped Test with failing teardown
6868
Test Should Have Been Skipped Failing test with failing teardown

‎atest/robot/output/test_criticality.robot

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎atest/robot/rpa/rebot_rpa_tasks.robot

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,8 @@ Outputs should contain correct mode information
9191
[Arguments] ${rpa}
9292
${title} = Set variable if "${rpa}" == "false" Test Task
9393
Element attribute should be ${OUTDIR}/output.xml rpa ${rpa}
94-
Element text should be ${OUTDIR}/output.xml Critical ${title}s xpath=statistics/total/stat[1]
95-
Element text should be ${OUTDIR}/output.xml All ${title}s xpath=statistics/total/stat[2]
94+
Element text should be ${OUTDIR}/output.xml All ${title}s xpath=statistics/total/stat[1]
9695
File should contain regexp ${OUTDIR}/log.html window\\.settings = \\{.*"rpa":${rpa},.*\\};
9796
File should contain regexp ${OUTDIR}/report.html window\\.settings = \\{.*"rpa":${rpa},.*\\};
98-
File should contain regexp ${OUTDIR}/log.html window\\.output\\["stats"\\] = \\[\\[\\{.*"label":"Critical ${title}s",.*\\}\\]\\];
99-
File should contain regexp ${OUTDIR}/report.html window\\.output\\["stats"\\] = \\[\\[\\{.*"label":"Critical ${title}s",.*\\}\\]\\];
10097
File should contain regexp ${OUTDIR}/log.html window\\.output\\["stats"\\] = \\[\\[\\{.*"label":"All ${title}s",.*\\}\\]\\];
10198
File should contain regexp ${OUTDIR}/report.html window\\.output\\["stats"\\] = \\[\\[\\{.*"label":"All ${title}s",.*\\}\\]\\];

‎atest/robot/rpa/run_rpa_tasks.robot

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,12 @@ Outputs should contain correct mode information
106106
${title} = Set variable if "${rpa}" == "false" Test Task
107107
${lower} = Set variable if "${rpa}" == "false" test task
108108
Element attribute should be ${OUTDIR}/output.xml rpa ${rpa}
109-
Element text should be ${OUTDIR}/output.xml Critical ${title}s xpath=statistics/total/stat[1]
110-
Element text should be ${OUTDIR}/output.xml All ${title}s xpath=statistics/total/stat[2]
109+
Element text should be ${OUTDIR}/output.xml All ${title}s xpath=statistics/total/stat[1]
111110
File should contain regexp ${OUTDIR}/log.html window\\.settings = \\{.*"rpa":${rpa},.*\\};
112111
File should contain regexp ${OUTDIR}/report.html window\\.settings = \\{.*"rpa":${rpa},.*\\};
113-
File should contain regexp ${OUTDIR}/log.html window\\.output\\["stats"\\] = \\[\\[\\{.*"label":"Critical ${title}s",.*\\}\\]\\];
114-
File should contain regexp ${OUTDIR}/report.html window\\.output\\["stats"\\] = \\[\\[\\{.*"label":"Critical ${title}s",.*\\}\\]\\];
115112
File should contain regexp ${OUTDIR}/log.html window\\.output\\["stats"\\] = \\[\\[\\{.*"label":"All ${title}s",.*\\}\\]\\];
116113
File should contain regexp ${OUTDIR}/report.html window\\.output\\["stats"\\] = \\[\\[\\{.*"label":"All ${title}s",.*\\}\\]\\];
117-
Stdout Should Contain Regexp \\d+ critical ${lower}s?, \\d+ passed, \\d+ failed\n\\d+ ${lower}s? total, \\d+ passed, \\d+ failed\n
114+
Stdout Should Contain Regexp \\d+ ${lower}s?, \\d+ passed, \\d+ failed\n
118115

119116
Initialize tests and tasks data
120117
Create directory ${TEMPDIR}/rpa

‎atest/robot/running/fatal_exception.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Multiple Suite Aware Exiting From Suite Setup With Skip Teardowns
6262

6363
Fatal Exception and Exit on Failure
6464
Run Tests --exitonfailure running/fatal_exception/01__python_library_kw.robot
65-
Check Test Case Test That Should Not Be Run 1 FAIL Critical failure occurred and exit-on-failure mode is in use.
65+
Check Test Case Test That Should Not Be Run 1 FAIL Failure occurred and exit-on-failure mode is in use.
6666

6767
Fatal Exception And Skip Teardown On Exit
6868
Run Tests --SkipTeardownOnExit running/fatal_exception

‎atest/robot/standard_libraries/builtin/run_keyword_based_on_suite_stats.robot

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,6 @@ Suite Setup Run Tests --critical critical standard_libraries/builtin
33
Resource atest_resource.robot
44

55
*** Test Case ***
6-
Run Keyword If All Critical Tests Passed
7-
${suite} = Get Test Suite Run Keyword If All Critical Tests Passed When Criticals Pass
8-
Should Be Equal ${suite.teardown.kws[0].name} My Teardown
9-
Check Log Message ${suite.teardown.kws[0].kws[0].msgs[0]} Suite teardown message
10-
11-
Run Keyword If All Critical Tests Passed Can't be Used In Test
12-
Check test Case Run Keyword If All Critical Tests Passed Can't be Used In Test
13-
14-
Run Keyword If All Critical Tests Passed Is not executed when Critcal Test Fails
15-
Check test Case Run Keyword If All Critical Tests Passed Is not executed when Critcal Test Fails
16-
17-
Run Keyword If Any Critical Tests Failed
18-
${suite} = Get Test Suite Run Keyword If Any Critical Tests Failed When Critical Fails
19-
Should Be Equal As Integers ${suite.statistics.critical.failed} 1
20-
Should Be Equal ${suite.teardown.kws[0].name} My Teardown
21-
Check Log Message ${suite.teardown.kws[0].kws[0].msgs[0]} Suite teardown message
22-
23-
Run Keyword If Any Critical Tests Failed Can't be Used In Test
24-
Check test Case Run Keyword If Any Critical Tests Failed Can't be Used In Test
25-
26-
Run Keyword If Any Critical Tests failed Is not executed when All Critical Tests Pass
27-
Check Test Case Run Keyword If Any Critical Tests failed Is not executed when All Critcal Tests Pass
28-
296
Run Keyword If All Tests Passed
307
${suite} = Get Test Suite Run Keyword If All Tests Passed When All Pass
318
Should Be Equal As Integers ${suite.statistics.all.failed} 0

‎atest/robot/standard_libraries/builtin/tags.robot

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
*** Settings ***
2-
Suite Setup Run Tests --critical *remove* standard_libraries/builtin/tags
2+
Suite Setup Run Tests ${EMPTY} standard_libraries/builtin/tags
33
Resource atest_resource.robot
44

55
*** Variables ***
@@ -57,11 +57,6 @@ Set Tags In Test Teardown
5757
Using Set And Remove Tags In Suite Teardown Fails
5858
Should Be Equal ${SUITE.suites[1].message} Suite teardown failed:\n'Set Tags' cannot be used in suite teardown.
5959

60-
Set and Removed Tags Should Affect Criticality
61-
${tags} = Get Total Stat Nodes
62-
Tag Statistics Should Be ${tags[0]} 0 0
63-
Tag Statistics Should Be ${tags[1]} 12 4
64-
6560
Modifying ${TEST TAGS} after setting them has no affect on tags test has
6661
Check Test Tags ${TEST NAME} force-init set-init new
6762

@@ -86,4 +81,3 @@ Tags Should Have Been Removed
8681
Remove Values From List ${tags} @{removed}
8782
${tc} = Check Test Tags ${testname} @{tags}
8883
[Return] ${tc}
89-

‎atest/robot/variables/same_variable_file_names.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Suite Setup Run Tests ${EMPTY} variables/same_variable_file_names
33
Resource atest_resource.robot
44

55
*** Variables ***
6-
${6 TESTS} 6 critical tests, 6 passed, 0 failed\n6 tests total, 6 passed, 0 failed
6+
${6 TESTS} 6 tests, 6 passed, 0 failed
77

88
*** Test Cases ***
99
Different Variable Files Are Imported Correctly

‎atest/robot/variables/suite_source.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Resource atest_resource.robot
44

55
*** Test Cases ***
66
\${SUITE SOURCE} in dir suite
7-
Check Test Suite Suite Source 3 critical tests, 3 passed, 0 failed\n3 tests total, 3 passed, 0 failed
7+
Check Test Suite Suite Source 3 tests, 3 passed, 0 failed
88

99
\${SUITE SOURCE} in file suite
1010
Check Test Case ${TEST NAME}

‎atest/testdata/variables/automatic_variables/auto1.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ${VARIABLE} variable value
1717
${EXP_SUITE_NAME} Automatic Variables.Auto1
1818
${EXP_SUITE_DOC} This is suite documentation. With ${VARIABLE}.
1919
${EXP_SUITE_META} {'MeTa1': 'Value', 'meta2': '${VARIABLE}'}
20-
${EXP_SUITE_STATS} 16 critical tests, 14 passed, 2 failed\n16 tests total, 14 passed, 2 failed
20+
${EXP_SUITE_STATS} 16 tests, 14 passed, 2 failed
2121
@{LAST_TEST} Previous Test Variables Should Have Correct Values When That Test Fails PASS
2222

2323
*** Test Case ***

‎atest/testdata/variables/automatic_variables/auto2.robot

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Suite Setup Check Variables In Suite Setup Automatic Variables.Auto2
33
... ${EMPTY} {} @{PREV_TEST}
44
Suite Teardown Check Variables In Suite Teardown Automatic Variables.Auto2 FAIL
5-
... 1 critical test, 0 passed, 1 failed\n1 test total, 0 passed, 1 failed
5+
... 1 test, 0 passed, 1 failed
66
... @{LAST_TEST}
77
Resource resource.robot
88

@@ -15,4 +15,3 @@ Previous Test Variables Should Have Default Values From Previous Suite
1515
[Documentation] FAIL Expected failure
1616
Check Previous Test Variables @{PREV_TEST}
1717
Fail Expected failure
18-

0 commit comments

Comments
 (0)