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

worker/envworkermanager: always stop worker on exit #2491

Merged

Conversation

rogpeppe
Copy link
Contributor

@rogpeppe 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/)

@rogpeppe rogpeppe force-pushed the 028-envworkermanager-kill-worker branch from cda2f0c to 919bf43 Compare June 4, 2015 15:47
@rogpeppe
Copy link
Contributor Author

rogpeppe commented Jun 5, 2015

$$merge$$

@jujubot
Copy link
Collaborator

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
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
Labels
None yet
Projects
None yet
2 participants