Display clouds integration test #11072
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
SimonRichardson
force-pushed
the
display-clouds-integration-test
branch
from
6234651
to
c0e2685
Compare
hmlanigan
requested changes
Jan 6, 2020
| fi | ||
|
|
||
| cp ./tests/suites/cli/clouds/public-clouds.yaml "${TEST_DIR}"/juju/public-clouds.yaml | ||
| OUT=$(XDG_DATA_HOME="${TEST_DIR}" juju clouds --local --format=json 2>/dev/null | jq ".[] | select(.defined != \"built-in\")") |
There was a problem hiding this comment.
Please add an echo of command run, or what's being attempted, for easier debugging and review of test results.
There was a problem hiding this comment.
Running: ./main.sh -V cli test_desplay_clouds (notice capital V) will tell you exactly what's running... It's easier to see what's going on.
There was a problem hiding this comment.
Okay that worked, but not exactly human reading friendly.
There was a problem hiding this comment.
I wonder if we can do something about that and only trace out certain things, let me think about this.
| EOF | ||
| ) | ||
|
|
||
| OUT=$(XDG_DATA_HOME="${TEST_DIR}" juju clouds --all --format=json 2>/dev/null | jq ".[] | select(.defined != \"built-in\")") |
There was a problem hiding this comment.
Please add an echo of command run, or what's being attempted, for easier debugging and review of test results.
There was a problem hiding this comment.
Running: ./main.sh -V cli test_desplay_clouds (notice capital V) will tell you exactly what's running... It's easier to see what's going on.
|
!!build!! |
|
|
The following changes introduce the idea of a display clouds integration
tests. Unfortunately it required to change how we handle machine
interactions. For formatting directives such as json or yaml, we never
want to be prompted for anything, we just either want an empty output in
the right format (json being {}) or the data.
Bringing in the changes is the first drive into doing so, the PR doesn't
enforce the changes through out, although it is a first step in doing
so.
Adding redirection of the stderr to /dev/null for machine directives is
pointless, so in the future checking for ctx.IsSerial() should be used.
If the value is true then omitting the information and the noise is
probably the wisest.
The following updates the test to use a real (read as "test") public cloud. That way it becomes more obvious what the test meant to do. The changes introduce a fake openstack test cloud with fake urls for the regions.
The following changes uses a real public cloud rather than some fake canonical one.
The following adds a reason for the introduction of IsSerial. The basic idea is that we want to provide a more holistic approach to handling the formatting directives in the CLI without having to resorting to magic string checking.
SimonRichardson
force-pushed
the
display-clouds-integration-test
branch
from
45ca26d
to
6815d74
Compare
The following updates show-storage so that it's backwards compatible
with the feature tests around it. Essentially the fact that the user
asked for formatted directive of yaml and instead was returned a string
doesn't match what they asked for.
The fix here is to say, return an empty object `{}` (remembering that
yaml is a subset of json) and then correctly outputting the issue to
stderr.
The consumer of the CLI can then either check stderr for issues or
redirect stderr to a file or /dev/null. Either way the consumer gets
valid yaml and you also get the correct information about why it failed.
See: https://discourse.jujucharms.com/t/cli-serialisable-output-formats/2490
The following cleans up the double logging from storage show command. It seemed ridiculous for every command to return an error and log the same error. To clean this up, the command package is now again opinionated correctly and we've followed suit with the commands.
|
|
|
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.
Checklist
Description of change
The following changes introduce the idea of a display clouds integration
tests. Unfortunately it required to change how we handle machine
interactions. For formatting directives such as json or yaml, we never
want to be prompted for anything, we just either want an empty output in
the right format (json being {}) or the data.
Bringing in the changes is the first drive into doing so, the PR doesn't
enforce the changes through out, although it is a first step in doing
so.
Adding redirection of the stderr to
/dev/nullfor machine directives ispointless, so in the future checking for
ctx.IsSerial()should be used.If the value is true then omitting the information and the noise is
probably the wisest.
See: https://discourse.jujucharms.com/t/cli-serialisable-output-formats/2490
QA steps
Please replace with how we can verify that the change works?