Container Setup Test Rewrite With Mocks #9260
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
…as in tests) can be used for instantiation.
…d mocks for both APICaller and FacadeCaller.
…on JujuConnSuite.
Replaces test for container manager config acquisition error.
…ld be OK to run on Windows.
SimonRichardson
approved these changes
Sep 27, 2018
| @@ -16,7 +16,7 @@ import ( | |||
|
|
|||
| // NewContainerManager creates the appropriate container.Manager for the | |||
| // specified container type. | |||
| func NewContainerManager(forType instance.ContainerType, conf container.ManagerConfig) (container.Manager, error) { | |||
| var NewContainerManager = func(forType instance.ContainerType, conf container.ManagerConfig) (container.Manager, error) { | |||
There was a problem hiding this comment.
I'm still not a huge fan of this, I'd rather we didn't patch these at test time, but considering the changes required to make this a dependency I'm all for this atm.
There was a problem hiding this comment.
Agreed. I don't like calls to patch at all.
If we lived in an ideal world, all these factory-type dependencies would be injected at the top, through the manifold by the dependency engine. Then at worker creation you could pass in a mock by its indirection.
Rolling it all back up would be a hell of a job though.
|
Check job looks like an intermittent failure. Let's try a |
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.
Description of change
The ContainerSetupSuite tests previously used JujuConnSuite and were racy.
This patch rectifies this with the following changes:
Note for Reviewers: worker/provisioner/container_initialisation_test.go bears little resemblance to its old form. It might be better than to read this in its own right rather than the diff.
QA steps
The re-written tests pass consistently.
Documentation changes
None.
Bug reference
N/A