/juju

worker/metricworker: cleanup and fix LP 1587701 #5507

Merged
merged 3 commits into from Jun 1, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@davecheney @jujubot
@davecheney
Contributor

davecheney commented Jun 1, 2016 •
Edited 1 time

Fixes LP 1587701

  • Remove notify global which was always nil during normal execution, it was only patched during tests
  • unexport all functions except the manifold creation, as they were never called in code, only by the manifold constructor. This makes passing the notify channel, for test, less gross
  • remove unused suites, this should fix the test timeout under the race detector.

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

davecheney added some commits Jun 1, 2016

@davecheney
Remove notify global 
The notify global is nil unless patched for tests. Extracting it to
parameter shows that it's only used by tests.
4075645
@davecheney
unexport private functions
2d0387a
@davecheney
remove unused suites
9ccb936
@davecheney
Contributor

davecheney commented Jun 1, 2016

$$fixes-1587701$$
@jujubot
Contributor

jujubot commented Jun 1, 2016

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

jujubot commented Jun 1, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/7929
@davecheney
Contributor

davecheney commented Jun 1, 2016

$$fixes-1587701$$
@jujubot
Contributor

jujubot commented Jun 1, 2016

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

@jujubot jujubot merged commit 38ada96 into juju:master Jun 1, 2016

@davecheney davecheney deleted the davecheney:fixedbugs/1587701 branch Jun 2, 2016

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