X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3facf89bf048487ee718fe15d012b489f2d407b7..HEAD:/lib/controller/federation/user_test.go diff --git a/lib/controller/federation/user_test.go b/lib/controller/federation/user_test.go index 2812c1f41d..33bc95d0ea 100644 --- a/lib/controller/federation/user_test.go +++ b/lib/controller/federation/user_test.go @@ -14,6 +14,7 @@ import ( "strings" "git.arvados.org/arvados.git/lib/controller/rpc" + "git.arvados.org/arvados.git/lib/ctrlctx" "git.arvados.org/arvados.git/sdk/go/arvados" "git.arvados.org/arvados.git/sdk/go/arvadostest" "git.arvados.org/arvados.git/sdk/go/auth" @@ -30,7 +31,7 @@ type UserSuite struct { func (s *UserSuite) TestLoginClusterUserList(c *check.C) { s.cluster.ClusterID = "local" s.cluster.Login.LoginCluster = "zzzzz" - s.fed = New(s.cluster) + s.fed = New(s.ctx, s.cluster, nil, (&ctrlctx.DBConnector{PostgreSQL: s.cluster.PostgreSQL}).GetDB) s.addDirectRemote(c, "zzzzz", rpc.NewConn("zzzzz", &url.URL{Scheme: "https", Host: os.Getenv("ARVADOS_API_HOST")}, true, rpc.PassthroughTokenProvider)) for _, updateFail := range []bool{false, true} { @@ -77,7 +78,7 @@ func (s *UserSuite) TestLoginClusterUserList(c *check.C) { "identity_url": false, // virtual attrs "full_name": false, - "is_invited": false, + "is_invited": true, } if opts.Select != nil { // Only the selected @@ -120,7 +121,7 @@ func (s *UserSuite) TestLoginClusterUserList(c *check.C) { func (s *UserSuite) TestLoginClusterUserGet(c *check.C) { s.cluster.ClusterID = "local" s.cluster.Login.LoginCluster = "zzzzz" - s.fed = New(s.cluster) + s.fed = New(s.ctx, s.cluster, nil, (&ctrlctx.DBConnector{PostgreSQL: s.cluster.PostgreSQL}).GetDB) s.addDirectRemote(c, "zzzzz", rpc.NewConn("zzzzz", &url.URL{Scheme: "https", Host: os.Getenv("ARVADOS_API_HOST")}, true, rpc.PassthroughTokenProvider)) opts := arvados.GetOptions{UUID: "zzzzz-tpzed-xurymjxw79nv3jz", Select: []string{"uuid", "email"}} @@ -145,7 +146,7 @@ func (s *UserSuite) TestLoginClusterUserGet(c *check.C) { "identity_url": false, // virtual attrs "full_name": false, - "is_invited": false, + "is_invited": true, } if opts.Select != nil { // Only the selected @@ -174,7 +175,7 @@ func (s *UserSuite) TestLoginClusterUserGet(c *check.C) { func (s *UserSuite) TestLoginClusterUserListBypassFederation(c *check.C) { s.cluster.ClusterID = "local" s.cluster.Login.LoginCluster = "zzzzz" - s.fed = New(s.cluster) + s.fed = New(s.ctx, s.cluster, nil, (&ctrlctx.DBConnector{PostgreSQL: s.cluster.PostgreSQL}).GetDB) s.addDirectRemote(c, "zzzzz", rpc.NewConn("zzzzz", &url.URL{Scheme: "https", Host: os.Getenv("ARVADOS_API_HOST")}, true, rpc.PassthroughTokenProvider))