application data bag: Fix racy WatchApplicationSettings tests #10573
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
howbazaar
suggested changes
Aug 29, 2019
state/relation_test.go
Outdated
| @@ -947,6 +947,7 @@ func (s *RelationSuite) TestWatchApplicationSettings(c *gc.C) { | |||
| c.Assert(err, jc.ErrorIsNil) | |||
| relation, err := s.State.AddRelation(eps...) | |||
| c.Assert(err, jc.ErrorIsNil) | |||
| s.State.StartSync() | |||
There was a problem hiding this comment.
You should instead use WaitForModelWatchersIdle(c, s.State.ModelUUID())
The reason it fails intermittently is that the state watcher will send down an initial event, but the events that are in flight from the construction of the relation may not have fully flowed through, so you end up with an additional notification.
This is why we have the WaitForModelWatcherIdle method.
There was a problem hiding this comment.
Ok, using that instead - thanks.
They'd get two notifications instead of the expected one about half the time under stress-race. Adding a WaitForModelWatchersIdle fixes this.
babbageclunk
force-pushed
the
2.7-test-race
branch
from
bb00751
to
8f71bee
Compare
|
|
howbazaar
approved these changes
Aug 29, 2019
|
|
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 WatchApplicationSettings tests would fail intermittently.
Example: https://jenkins.juju.canonical.com/view/Unit%20tests/job/RunUnittests-race-amd64/1764/testReport/github/com_juju_juju_state/TestPackage/
They're getting two notifications on the watcher instead of the expected one about half the time under stress-race. Adding a StartSync fixes this.
QA steps
Documentation changes
None
Bug reference
None