/juju

Revert "Merge pull request #5858 from bz2/revert_pr5758" #5877

Merged
merged 5 commits into from Aug 9, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@axw @anastasiamac @Veebers @jujubot
@axw
Member

axw commented Jul 27, 2016

This reverts commit 66555a8, reversing
changes made to 0c3cf8a.

Also: cmd/juju/controller: fix model auto-switching

When you use "juju register" and you have access to only one model, you're
automatically switched to that model. We must qualify the model name if it
is not owned by you.
@axw
Member

axw commented Jul 27, 2016

QA

  1. juju add-user --models=default bob
  2. (with JUJU_DATA pointed at a temp dir) juju register ...
    (This would fail before, saying model "bob@local/default" does not exist. With the change, it works.)

Also, ran assess_user_grant_revoke.py from juju-ci-tools with my MP (https://code.launchpad.net/~axwalk/juju-ci-tools/juju-ci-tools/+merge/301056) applied.
@axw
Member

axw commented Jul 27, 2016

Please ignore this until the CI MP is ready.
state/user_test.go
err := user.Disable()
c.Assert(err, jc.ErrorIsNil)
c.Assert(user.IsDisabled(), jc.IsTrue)
c.Assert(user.PasswordValid("a-password"), jc.IsFalse)
+ c.Assert(s.activeUsers(c), jc.DeepEquals, []string{"test-admin"})
@anastasiamac

anastasiamac Aug 9, 2016

Member

It's interesting that we are expecting disabled user to be listed as active... Are you sure?

@anastasiamac

anastasiamac Aug 9, 2016

Member

Oh I see. You've disabled user not "test-admin"! All good :)

@anastasiamac
Member

anastasiamac commented Aug 9, 2016

LGTM
@Veebers
Owner

Veebers commented Aug 9, 2016

$$merge$$
@axw
Member

axw commented Aug 9, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Aug 9, 2016

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

jujubot commented Aug 9, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/8663

axw added some commits Jul 25, 2016

@axw
Revert "Merge pull request #5858 from bz2/revert_pr5758" 
This reverts commit 66555a8, reversing
changes made to 0c3cf8a.
0b61f2e
@axw
cmd/juju/controller: fix model auto-switching 
When you use "juju register" and you have access
to only one model, you're automatically switched
to that model. We must qualify the model name if
it is not owned by you.
7317897
@axw
state: fix User.AllUsers
c9adf9c
@axw
cmd/...: fix tests
e567f48
@axw
Member

axw commented Aug 9, 2016

Seems there's an issue with MongoDB 2.4. Looking into it now.
@anastasiamac
Member

anastasiamac commented Aug 9, 2016

Thank you for updating by removing an "or" sub-clause to run with mongo 2.4
LGTM
@axw
Member

axw commented Aug 9, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Aug 9, 2016

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

@jujubot jujubot merged commit ff21860 into juju:master Aug 9, 2016

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