Fix model default tests + Allow empty default-series with default-base. #15718
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
approved these changes
Jun 9, 2023
hpidcock
force-pushed
the
fix-model-config-tests
branch
from
22ebf8e
to
9553042
Compare
hpidcock
force-pushed
the
fix-model-config-tests
branch
from
9553042
to
345c417
Compare
|
/merge |
Merged
jujubot
added a commit
that referenced
this pull request
Jun 13, 2023
Merged
jujubot
added a commit
that referenced
this pull request
Jun 14, 2023
jujubot
added a commit
that referenced
this pull request
Jun 15, 2023
#15761 Forward merge Merges: - #15718 - #15736 - #15728 - #15739 - #15740 - #15741 - #15726 - #15742 - #15745 - #15747 - #15688 Conflicts: - api/watcher/watcher_test.go (imports re-generated) - apiserver/facades/client/client/testing/suite.go (deleted in main) - apiserver/facades/controller/charmdownloader/interfaces.go (imports re-generated) - apiserver/rest_test.go (imports re-generated) - cmd/juju/application/deploy_test.go ([These tests](https://github.com/juju/juju/blob/3.3/cmd/juju/application/deploy_test.go#L1598-L1807) were moved to bundle_test.go in main. Resolve this conflict by removing from deploy_test.go & adding [this commit](f10917f) to transfer over a change that was lost) - cmd/juju/application/export_test.go (imports re-generated) - cmd/juju/application/unexpose_test.go (imports re-generated) - core/cache/unit.go (deleted in main) - core/cache/unit_test.go (deleted in main) - core/charm/downloader/mocks/charm_mocks.go (generated mocks re-generated) - core/charm/downloader/mocks/storage_mocks.go (generated mocks re-generated) - juju/testing/repo.go (deleted in main) NOTE: Once merge conflicts were resolved, a unit test still panicked. This has been resolved in [this commit](f10917f)
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.
Fixes model default tests to not pass the model name incorrectly.
Fixes exporting model-config then reimporting model-config as it will always have both default-series and default-base, but default-series being empty while passing default-base should be allowed and ignored.
QA steps
./main.sh -v -s '"test_block_commands,test_display_clouds,test_local_charms,test_model_config,test_unregister"' cli test_model_defaultsjuju bootstrap microk8s; juju model-config --format=yaml | juju model-config --ignore-read-only-fields --file -Documentation changes
N/A
Bug reference
https://jenkins.juju.canonical.com/job/test-cli-test-model-defaults-lxd/1205/consoleText