X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f3e3a6cc4b72120f856e14f3039b1c0c1f0326bd..9d095072a57089b4858b632199f3b57871458dee:/lib/controller/localdb/login_testuser_test.go diff --git a/lib/controller/localdb/login_testuser_test.go b/lib/controller/localdb/login_testuser_test.go index 7589088899..51c2416f59 100644 --- a/lib/controller/localdb/login_testuser_test.go +++ b/lib/controller/localdb/login_testuser_test.go @@ -6,12 +6,14 @@ package localdb import ( "context" + "database/sql" "git.arvados.org/arvados.git/lib/config" "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" "git.arvados.org/arvados.git/sdk/go/ctxlog" "github.com/jmoiron/sqlx" check "gopkg.in/check.v1" @@ -26,8 +28,8 @@ type TestUserSuite struct { db *sqlx.DB // transaction context - ctx context.Context - rollback func() error + ctx context.Context + tx *sqlx.Tx } func (s *TestUserSuite) SetUpSuite(c *check.C) { @@ -41,8 +43,8 @@ func (s *TestUserSuite) SetUpSuite(c *check.C) { } s.railsSpy = arvadostest.NewProxy(c, s.cluster.Services.RailsAPI) s.ctrl = &testLoginController{ - 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)}, } s.db = arvadostest.DB(c, s.cluster) } @@ -51,13 +53,11 @@ func (s *TestUserSuite) SetUpTest(c *check.C) { tx, err := s.db.Beginx() c.Assert(err, check.IsNil) s.ctx = ctrlctx.NewWithTransaction(context.Background(), tx) - s.rollback = tx.Rollback + s.tx = tx } func (s *TestUserSuite) TearDownTest(c *check.C) { - if s.rollback != nil { - s.rollback() - } + s.tx.Rollback() } func (s *TestUserSuite) TestLogin(c *check.C) { @@ -101,3 +101,46 @@ func (s *TestUserSuite) TestLoginForm(c *check.C) { c.Check(resp.HTML.String(), check.Matches, `(?ms).*