Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a watcher race that was in the ControllerAddressesSuite. #11313

Merged
merged 1 commit into from Mar 13, 2020

Conversation

@howbazaar
Copy link
Member

howbazaar commented Mar 13, 2020

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.

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.
@howbazaar

This comment has been minimized.

Copy link
Member Author

howbazaar commented Mar 13, 2020

$$merge$$

@jujubot jujubot merged commit 5faf7ce into juju:2.7 Mar 13, 2020
4 of 5 checks passed
4 of 5 checks passed
Client Tests (ubuntu-latest) Client Tests (ubuntu-latest)
Details
Lint
Details
Schema
Details
merge-multi-juju Build started for merge commit.
Details
check-multi-juju Build finished.
Details
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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.