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

Fix LP-1355521 :: update config before making the worker #500

Merged
merged 1 commit into from Aug 12, 2014
Merged

Fix LP-1355521 :: update config before making the worker #500

merged 1 commit into from Aug 12, 2014

Conversation

johnweldon
Copy link
Contributor

Fixes lp-1355521

s.updateConfig was happening after the suite already set up the worker. This resulted in the environment not being consistently initialized, and resulted in the test timing out after 10 minutes on my machine.

Moving the s.updateConfig call to the beginning of the test, like all the other tests in this file, resolved the issue.

@bz2
Copy link
Contributor

bz2 commented Aug 12, 2014

LGTM. Wonder if this was a merge/rebase issue...

@johnweldon
Copy link
Contributor Author

JFDI

$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Aug 12, 2014

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

@jujubot
Copy link
Collaborator

jujubot commented Aug 12, 2014

Build failed: Does not match ['fixes-1347715', 'fixes-1355324']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/270

@bz2
Copy link
Contributor

bz2 commented Aug 12, 2014

JFDI
$$merge$$

@jujubot
Copy link
Collaborator

jujubot commented Aug 12, 2014

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

jujubot added a commit that referenced this pull request Aug 12, 2014
Fix LP-1355521 :: update config before making the worker

Fixes lp-1355521

s.updateConfig was happening *after* the suite already set up the worker.  This resulted in the environment not being consistently initialized, and resulted in the test timing out after 10 minutes on my machine.

Moving the s.updateConfig call to the beginning of the test, like all the other tests in this file, resolved the issue.
@jujubot jujubot merged commit c07c0a9 into juju:master Aug 12, 2014
@johnweldon johnweldon deleted the LP-1355521 branch August 12, 2014 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants