← Back to branch summary

~juju-qa/ubuntu/xenial/juju/2.0-rc2

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/featuretests/api_model_test.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/featuretests/api_model_test.go
16
16
        "github.com/juju/juju/api"
17
17
        "github.com/juju/juju/api/modelmanager"
18
18
        "github.com/juju/juju/apiserver/params"
19
 
        "github.com/juju/juju/core/description"
20
19
        jujunames "github.com/juju/juju/juju/names"
21
20
        "github.com/juju/juju/juju/testing"
 
21
        "github.com/juju/juju/permission"
22
22
        "github.com/juju/juju/state"
23
23
        coretesting "github.com/juju/juju/testing"
24
24
        "github.com/juju/juju/testing/factory"
66
66
 
67
67
        modelUser, err := s.State.UserAccess(user.UserTag, s.State.ModelTag())
68
68
        c.Assert(err, jc.ErrorIsNil)
69
 
        c.Assert(modelUser, gc.Not(gc.DeepEquals), description.UserAccess{})
 
69
        c.Assert(modelUser, gc.Not(gc.DeepEquals), permission.UserAccess{})
70
70
 
71
71
        // Then test unsharing the environment.
72
72
        err = mm.RevokeModel(user.UserName, "read", model.UUID())
74
74
 
75
75
        modelUser, err = s.State.UserAccess(user.UserTag, s.State.ModelTag())
76
76
        c.Assert(errors.IsNotFound(err), jc.IsTrue)
77
 
        c.Assert(modelUser, gc.DeepEquals, description.UserAccess{})
 
77
        c.Assert(modelUser, gc.DeepEquals, permission.UserAccess{})
78
78
}
79
79
 
80
80
func (s *apiEnvironmentSuite) TestEnvironmentUserInfo(c *gc.C) {
101
101
        })
102
102
}
103
103
 
104
 
func lastConnPointer(c *gc.C, st *state.State, modelUser description.UserAccess) *time.Time {
 
104
func lastConnPointer(c *gc.C, st *state.State, modelUser permission.UserAccess) *time.Time {
105
105
        lastConn, err := st.LastModelConnection(modelUser.UserTag)
106
106
        if err != nil {
107
107
                if state.IsNeverConnectedError(err) {