worker/envworkermanager: always stop worker on exit #2491

Merged
merged 1 commit into from Jun 5, 2015

Conversation

Projects
None yet
2 participants
Owner

rogpeppe commented Jun 4, 2015

This fixes an intermittent test failure in TestLoopExitKillsRunner
which happened because the underlying worker was not killed
when the loop terminated with an error.

We also change the API into a slightly more general form - there's
no need for the EnvWorkerManager to know that the worker
it's dealing with is actually a worker.Runner, and this makes
the tests slightly simpler to write (and arguably the API easier
to understand)

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

Owner

rogpeppe commented Jun 5, 2015

$$merge$$

Contributor

jujubot commented Jun 5, 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 5, 2015

Merge pull request #2491 from rogpeppe/028-envworkermanager-kill-worker
worker/envworkermanager: always stop worker on exit

This fixes an intermittent test failure in TestLoopExitKillsRunner
which happened because the underlying worker was not killed
when the loop terminated with an error.

We also change the API into a slightly more general form - there's
no need for the EnvWorkerManager to know that the worker
it's dealing with is actually a worker.Runner, and this makes
the tests slightly simpler to write (and arguably the API easier
to understand)


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

@jujubot jujubot merged commit 884972e into juju:master Jun 5, 2015

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