projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16306: Merge branch 'master'
[arvados.git]
/
lib
/
controller
/
localdb
/
login_pam_test.go
diff --git
a/lib/controller/localdb/login_pam_test.go
b/lib/controller/localdb/login_pam_test.go
index d32aa1f24656977c5c094fa243429b5fa879b05b..c5876bbfad6280ad407aadece8cef5be606b187a 100644
(file)
--- a/
lib/controller/localdb/login_pam_test.go
+++ b/
lib/controller/localdb/login_pam_test.go
@@
-32,12
+32,12
@@
func (s *PamSuite) SetUpSuite(c *check.C) {
c.Assert(err, check.IsNil)
s.cluster, err = cfg.GetCluster("")
c.Assert(err, check.IsNil)
c.Assert(err, check.IsNil)
s.cluster, err = cfg.GetCluster("")
c.Assert(err, check.IsNil)
- s.cluster.Login.PAM = true
- s.cluster.Login.PAMDefaultEmailDomain = "example.com"
+ s.cluster.Login.PAM
.Enable
= true
+ s.cluster.Login.PAM
.
DefaultEmailDomain = "example.com"
s.railsSpy = arvadostest.NewProxy(c, s.cluster.Services.RailsAPI)
s.ctrl = &pamLoginController{
s.railsSpy = arvadostest.NewProxy(c, s.cluster.Services.RailsAPI)
s.ctrl = &pamLoginController{
- Cluster:
s.cluster,
-
RailsProxy: rpc.NewConn(s.cluster.ClusterID, s.railsSpy.URL, true, rpc.PassthroughTokenProvider)
,
+ Cluster: s.cluster,
+
Parent: &Conn{railsProxy: rpc.NewConn(s.cluster.ClusterID, s.railsSpy.URL, true, rpc.PassthroughTokenProvider)}
,
}
}
}
}
@@
-74,9
+74,11
@@
func (s *PamSuite) TestLoginSuccess(c *check.C) {
Password: p,
})
c.Check(err, check.IsNil)
Password: p,
})
c.Check(err, check.IsNil)
- c.Check(resp.APIToken, check.Matches, `v2/zzzzz-gj3su-.*/.*`)
+ c.Check(resp.APIToken, check.Not(check.Equals), "")
+ c.Check(resp.UUID, check.Matches, `zzzzz-gj3su-.*`)
+ c.Check(resp.Scopes, check.DeepEquals, []string{"all"})
authinfo := getCallbackAuthInfo(c, s.railsSpy)
authinfo := getCallbackAuthInfo(c, s.railsSpy)
- c.Check(authinfo.Email, check.Equals, u+"@"+s.cluster.Login.PAMDefaultEmailDomain)
+ c.Check(authinfo.Email, check.Equals, u+"@"+s.cluster.Login.PAM
.
DefaultEmailDomain)
c.Check(authinfo.AlternateEmails, check.DeepEquals, []string(nil))
}
c.Check(authinfo.AlternateEmails, check.DeepEquals, []string(nil))
}