worker/peergrouper: fix data race in test #2631

Merged
merged 1 commit into from Jun 23, 2015

Conversation

Projects
None yet
2 participants
Owner

rogpeppe commented Jun 23, 2015

This reverts PR #2629, which breaks watcher invariants and will not
actually fix the test, and fixes the issue slightly differently.

There are still multiple intermittent failures in this package which this
PR does not fix.

If PR #2629 had not been applied, the only changes would have been
to the assertMembers function.

(Review request: http://reviews.vapour.ws/r/2005/)

worker/peergrouper: fix data race in test
This reverts PR #2629, which breaks watcher invariants and will not
actually fix the test, and fixes the issue slightly differently.

There are still multiple intermittent failures in this package which this
PR does not fix.
Owner

rogpeppe commented Jun 23, 2015

$$merge$$

Contributor

jujubot commented Jun 23, 2015

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

jujubot added a commit that referenced this pull request Jun 23, 2015

Merge pull request #2631 from rogpeppe/031-fix-peergouper-race
worker/peergrouper: fix data race in test

This reverts PR #2629, which breaks watcher invariants and will not
actually fix the test, and fixes the issue slightly differently.

There are still multiple intermittent failures in this package which this
PR does not fix.

If PR #2629 had not been applied, the only changes would have been
to the assertMembers function.

(Review request: http://reviews.vapour.ws/r/2005/)

@jujubot jujubot merged commit fcf3fa4 into juju:master Jun 23, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment