/juju

apiserver: do not access state in NewServer - fixes-1504578 #3485

Merged
merged 1 commit into from Oct 14, 2015

Conversation

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

rogpeppe commented Oct 12, 2015

We also ensure that the listener is closed when NewServer fails and that we allow an agent login without requiring the environment configuration (that's also potentially problematic if the user database needs a migration but not something we can easily sort out now).

We also remove apiclientSuite.TestConnectWebsocketPrefersLocalhostIfPresent because the logic it was supposed be testing has long been removed and didn't actually test that logic in the first place.

Fixes https://bugs.launchpad.net/juju-core/+bug/1504578.
fixes-1504578
['fixes-1504578']

(Review request: http://reviews.vapour.ws/r/2878/)
@rogpeppe
Owner

rogpeppe commented Oct 14, 2015

$$merge$$
@jujubot
Contributor

jujubot commented Oct 14, 2015

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

jujubot commented Oct 14, 2015

Build failed: Does not match ['fixes-1504578']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/5081
@rogpeppe
Owner

rogpeppe commented Oct 14, 2015

$$merge$$

@rogpeppe rogpeppe changed the title from apiserver: do not access state in NewServer to apiserver: do not access state in NewServer - fixes-1504578 Oct 14, 2015

@jujubot
Contributor

jujubot commented Oct 14, 2015

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

jujubot commented Oct 14, 2015

Build failed: Does not match ['fixes-1504578']
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/5083
@rogpeppe
Owner

rogpeppe commented Oct 14, 2015

fixes-1504578
@rogpeppe
Owner

rogpeppe commented Oct 14, 2015

$$merge$$
@jujubot
Contributor

jujubot commented Oct 14, 2015

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

jujubot commented Oct 14, 2015

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/5084
@rogpeppe
Owner

rogpeppe commented Oct 14, 2015

$$merge$$
@jujubot
Contributor

jujubot commented Oct 14, 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 Oct 14, 2015

@jujubot
Merge pull request #3485 from rogpeppe/060-apiserver-no-NewServer-sta… 
…te-access

apiserver: do not access state in NewServer - fixes-1504578

We also ensure that the listener is closed when NewServer fails and that we allow an agent login without requiring the environment configuration (that's also potentially problematic if the user database needs a migration but not something we can easily sort out now).

We also remove apiclientSuite.TestConnectWebsocketPrefersLocalhostIfPresent because the logic it was supposed be testing has long been removed and didn't actually test that logic in the first place.

Fixes https://bugs.launchpad.net/juju-core/+bug/1504578.
fixes-1504578
['fixes-1504578']

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

@jujubot jujubot merged commit e048625 into juju:chicago-cubs Oct 14, 2015

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