Lp 1927656 #13096
Merged
Lp 1927656 #13096
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
hpidcock
approved these changes
Jun 23, 2021
| @@ -202,14 +201,14 @@ func (s *BaseSuite) setupController(c *gc.C) *gomock.Controller { | |||
| return "appuuid", nil | |||
| } | |||
|
|
|||
| s.mockNamespaces.EXPECT().Get(gomock.Any(), s.getNamespace(), v1.GetOptions{}). | |||
| s.mockNamespaces.EXPECT().Get(gomock.Any(), s.getNamespace(), v1.GetOptions{}).Times(2). | |||
There was a problem hiding this comment.
I think just making this .Any() would be fine.
There was a problem hiding this comment.
I'd prefer asserting more explicitly. And also set to AnyTimes() here might fail the later namespace get assertion statements in other real tests.
|
|
jujubot
added a commit
that referenced
this pull request
Jun 28, 2021
#13109 Merge from 2.9 to bring forward: - #13103 from manadart/2.9-lxd-spec-assignment - #13105 from ycliuhw/fix/lp-1929904 - #13106 from SimonRichardson/update-http-dep - #13100 from tlm/model-operator-29-upgrade - #13102 from manadart/2.9-lxd-with-proxy - #13099 from SimonRichardson/updating-packaging-dep - #13096 from ycliuhw/lp-1927656 - #13101 from hpidcock/aws-encrypted-ebs - #13073 from tlm/LP1930798-juju-2.9-k8s-upgrade-2 - #13078 from hmlanigan/sidecar-charm-via-bundle - #13098 from achilleasa/2.9-logsink-error-if-persisting-logs-to-db-fails - #13091 from wallyworld/use-aws-sdk-v2 - #13095 from jujubot/increment-to-2.9.7 Conflicts: - caas/kubernetes/provider/export_test.go - cmd/juju/application/deployer/bundlehandler.go - cmd/juju/application/deployer/deployer.go - core/bundle/changes/handlers.go - core/charm/computedseries.go - go.mod - go.sum - scripts/win-installer/setup.iss - snap/snapcraft.yaml - version/version.go
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.
Ensure the controllerUUID annotation of the migrated model's namespace gets updated to the new controller's UUID;
Checklist
Requires a pylibjuju changeAdded integration tests for the PRAdded or updated doc.go related to packages changedQA steps
Documentation changes
No
Bug reference
https://bugs.launchpad.net/juju/+bug/1927656