[JUJU-1821] Fixed test-controller-test-unregister-test #14623
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wallyworld
requested changes
Sep 18, 2022
| @@ -12,8 +12,12 @@ run_unregister() { | |||
| juju controllers --format=json | jq -r ".\"controllers\" | has(\"${controller_name}\")" | check true | |||
|
|
|||
| echo "Backup controller info before unregister" | |||
| cp ~/.local/share/juju/controllers.yaml ~/.local/share/juju/controllers.yaml.bak | |||
| cp ~/.local/share/juju/accounts.yaml ~/.local/share/juju/accounts.yaml.bak | |||
| if [[ -f "${HOME}/.local/share/juju/controllers.yaml" ]]; then | |||
There was a problem hiding this comment.
This appears wrong - if there's no controllers.yaml file, then there's no controller to unregister in the first place. Adding the file check seems to be hiding a genuine problem with the test. This is supported by the line abobe this
juju controllers --format=json | jq -r ".\"controllers\" | has(\"${controller_name}\")" | check true
Why are we using | true which can hide the fact that the expected controller doesn't exist. We should fail the test at that point if the juju controllers command fails.
wallyworld
approved these changes
Sep 19, 2022
|
/merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes the test-controller-test-unregister-test tests, the original test does not consider that
controllers.yamlfile may not exist.The test is now rewritten using the fake
controllers.yamlfile created in the test folder.The test is moved from the controller suite to the cli suite.
Checklist
QA steps
Commands to run to verify that the change works.
cd tests ./main.sh -v cli run_unregister