projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15964: Remove qr1hi from a few more places. Delete unused includes.
[arvados.git]
/
lib
/
controller
/
localdb
/
login_ldap_test.go
diff --git
a/lib/controller/localdb/login_ldap_test.go
b/lib/controller/localdb/login_ldap_test.go
index 64ae58bce2681f792020b1855c2465d5ad226ae1..700d757c274d707c703ad0c58dbac812440a45a6 100644
(file)
--- a/
lib/controller/localdb/login_ldap_test.go
+++ b/
lib/controller/localdb/login_ldap_test.go
@@
-6,18
+6,19
@@
package localdb
import (
"context"
import (
"context"
- "database/sql"
"encoding/json"
"net"
"net/http"
"git.arvados.org/arvados.git/lib/config"
"git.arvados.org/arvados.git/lib/controller/railsproxy"
"encoding/json"
"net"
"net/http"
"git.arvados.org/arvados.git/lib/config"
"git.arvados.org/arvados.git/lib/controller/railsproxy"
+ "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/bradleypeabody/godap"
"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/bradleypeabody/godap"
+ "github.com/jmoiron/sqlx"
check "gopkg.in/check.v1"
)
check "gopkg.in/check.v1"
)
@@
-27,11
+28,11
@@
type LDAPSuite struct {
cluster *arvados.Cluster
ctrl *ldapLoginController
ldap *godap.LDAPServer // fake ldap server that accepts auth goodusername/goodpassword
cluster *arvados.Cluster
ctrl *ldapLoginController
ldap *godap.LDAPServer // fake ldap server that accepts auth goodusername/goodpassword
- db *sql.DB
+ db *sql
x
.DB
// transaction context
ctx context.Context
// transaction context
ctx context.Context
- rollback func()
+ rollback func()
error
}
func (s *LDAPSuite) TearDownSuite(c *check.C) {
}
func (s *LDAPSuite) TearDownSuite(c *check.C) {
@@
-48,6
+49,7
@@
func (s *LDAPSuite) SetUpSuite(c *check.C) {
c.Assert(err, check.IsNil)
ln, err := net.Listen("tcp", "127.0.0.1:0")
c.Assert(err, check.IsNil)
ln, err := net.Listen("tcp", "127.0.0.1:0")
+ c.Assert(err, check.IsNil)
s.ldap = &godap.LDAPServer{
Listener: ln,
Handlers: []godap.LDAPRequestHandler{
s.ldap = &godap.LDAPServer{
Listener: ln,
Handlers: []godap.LDAPRequestHandler{
@@
-91,15
+93,20
@@
func (s *LDAPSuite) SetUpSuite(c *check.C) {
Cluster: s.cluster,
RailsProxy: railsproxy.NewConn(s.cluster),
}
Cluster: s.cluster,
RailsProxy: railsproxy.NewConn(s.cluster),
}
- s.db =
testdb
(c, s.cluster)
+ s.db =
arvadostest.DB
(c, s.cluster)
}
func (s *LDAPSuite) SetUpTest(c *check.C) {
}
func (s *LDAPSuite) SetUpTest(c *check.C) {
- s.ctx, s.rollback = testctx(c, s.db)
+ tx, err := s.db.Beginx()
+ c.Assert(err, check.IsNil)
+ s.ctx = ctrlctx.NewWithTransaction(context.Background(), tx)
+ s.rollback = tx.Rollback
}
func (s *LDAPSuite) TearDownTest(c *check.C) {
}
func (s *LDAPSuite) TearDownTest(c *check.C) {
- s.rollback()
+ if s.rollback != nil {
+ s.rollback()
+ }
}
func (s *LDAPSuite) TestLoginSuccess(c *check.C) {
}
func (s *LDAPSuite) TestLoginSuccess(c *check.C) {