Fix a watcher race that was in the ControllerAddressesSuite. #11313
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
It looks like the two WatchAPIHostPorts tests were moved from state_test.go around nine months ago, but somehow we ended up with both. I have removed the copy that was in the state_test file. The StateSuite had the WaitForModelWatchersIdle at the end of the setup, but the ControllerAddressesSuite didn't. This allowed for initial creation events to still be propagating through the system when the tests started.
wallyworld
approved these changes
Mar 13, 2020
|
|
jujubot
added a commit
that referenced
this pull request
Mar 13, 2020
#11314 ## Description of change Merge 2.7 bringing in these PRs: #11286 speed up juju status by handling units better #11296 fix LP:1860083 machine availability zone #11291 various refactorings (method renames, tools finder/getter handle k8s broker) #11297 juju show-action-status not listing all #11300 k8s controllers can start lxd containers #11304 protect against nil profile from the charm #11310 speed up processing of machines in juju status #11306 ensure k8s juju upgrades select correct agent version #11313 fix watcher race in ControllerAddressSuite #11302 fix LP:1866658 jujud called in makefile before it is built ## QA steps Run unit tests
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.
It looks like the two WatchAPIHostPorts tests were moved from state_test.go
around nine months ago, but somehow we ended up with both. I have removed
the copy that was in the state_test file.
The StateSuite had the WaitForModelWatchersIdle at the end of the setup,
but the ControllerAddressesSuite didn't. This allowed for initial creation
events to still be propagating through the system when the tests started.
The StateSuite was also reading the model from the database, but this was
already there through the statetesting.StateSuite that the ConnSuite included.
So a drive by to delete that and use the model that was already there.