[skip ci] Make it a fatal error if vic machine fails to cleanup a VCH #6980
Conversation
tests/resources/VCH-Util.robot
Outdated
| @@ -322,7 +322,8 @@ Run Secret VIC Machine Inspect Command | |||
|
|
|||
| Run VIC Machine Delete Command | |||
| ${rc} ${output}= Run Secret VIC Machine Delete Command %{VCH-NAME} | |||
| Wait Until Keyword Succeeds 6x 5s Check Delete Success %{VCH-NAME} | |||
| ${status}= Run Keyword And Return Status Wait Until Keyword Succeeds 6x 5s Check Delete Success %{VCH-NAME} | |||
| Run Keyword Unless ${status} Fatal Error vic-machine delete has failed to remove the VCH: %{VCH-NAME} as expected | |||
There was a problem hiding this comment.
Is there any way we could have a suite/group cleanup check?
In both the vic-machine-service tests and the delete-resource-pool tests we're leaking because we don't call vic-machine delete, not because it fails.
tests/resources/VCH-Util.robot
Outdated
| @@ -322,7 +322,8 @@ Run Secret VIC Machine Inspect Command | |||
|
|
|||
| Run VIC Machine Delete Command | |||
| ${rc} ${output}= Run Secret VIC Machine Delete Command %{VCH-NAME} | |||
| Wait Until Keyword Succeeds 6x 5s Check Delete Success %{VCH-NAME} | |||
| ${status}= Run Keyword And Return Status Wait Until Keyword Succeeds 6x 5s Check Delete Success %{VCH-NAME} | |||
| Run Keyword Unless ${status} Conditional Fatal Error vic-machine delete has failed to remove the VCH: %{VCH-NAME} as expected | |||
There was a problem hiding this comment.
This might be a request for a different Keyword, but I would more naturally phrase this with the same imperatives used in unit tests:
- assert
- require
Assert is a failure, require is a fatal failure. In this case we're changing the behaviour of assert to control whether it become fatal, so it wraps both the check of status and the appropriate handling on failure into a single keyword:
${status}= Run Keyword And Return Status Wait Until Keyword Succeeds 6x 5s Check Delete Success %{VCH-NAME}
Assert ${status} "vic-machine delete failed to remove %{VCH-NAME}"
mhagen-vmware
force-pushed
the
feature/fatal-cleanup
branch
from
262e07b
to
c159540
Compare
|
Should the [skip ci] be moved to the body? |
Codecov Report
@@ Coverage Diff @@
## master #6980 +/- ##
==========================================
- Coverage 31.58% 31.57% -0.02%
==========================================
Files 278 278
Lines 42173 42173
==========================================
- Hits 13322 13315 -7
- Misses 27684 27692 +8
+ Partials 1167 1166 -1
Continue to review full report at Codecov.
|
|
@sgairo [skip ci] needs to be in the title still: |
fixes #7040
Also needs #7060 to be merged to complete