Merge branch '21666-provision-test-improvement'

[arvados.git] / lib / controller / federation / federation_test.go

diff --git a/lib/controller/federation/federation_test.go b/lib/controller/federation/federation_test.go
index 50f7eea42b3fe162de4282f009d31f162df5cd4f..6e85dfdba2a627545264f0530d194522c2b03f47 100644 (file)
--- a/lib/controller/federation/federation_test.go
+++ b/lib/controller/federation/federation_test.go
@@ -70,7 +70,7 @@ func (s *FederationSuite) SetUpTest(c *check.C) {
        ctx = ctrlctx.NewWithTransaction(ctx, s.tx)
        s.ctx = ctx
 
-       s.fed = New(s.cluster)
+       s.fed = New(ctx, s.cluster, nil, (&ctrlctx.DBConnector{PostgreSQL: s.cluster.PostgreSQL}).GetDB)
 }
 
 func (s *FederationSuite) TearDownTest(c *check.C) {
@@ -86,12 +86,12 @@ func (s *FederationSuite) addDirectRemote(c *check.C, id string, backend backend
 
 func (s *FederationSuite) addHTTPRemote(c *check.C, id string, backend backend) {
        srv := httpserver.Server{Addr: ":"}
-       srv.Handler = router.New(backend, nil)
+       srv.Handler = router.New(backend, router.Config{})
        c.Check(srv.Start(), check.IsNil)
        s.cluster.RemoteClusters[id] = arvados.RemoteCluster{
                Scheme: "http",
                Host:   srv.Addr,
                Proxy:  true,
        }
-       s.fed.remotes[id] = rpc.NewConn(id, &url.URL{Scheme: "http", Host: srv.Addr}, true, saltedTokenProvider(s.fed.local, id))
+       s.fed.remotes[id] = rpc.NewConn(id, &url.URL{Scheme: "http", Host: srv.Addr}, true, saltedTokenProvider(s.cluster, s.fed.local, id))
 }