X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b49229f98012d7c08ce02b8d28dbcc165c8a6c53..3fa0a5500d5b58b5d0b9ea940dac85be2da079ec:/lib/controller/federation/federation_test.go

diff --git a/lib/controller/federation/federation_test.go b/lib/controller/federation/federation_test.go
index f57d827848..fdc4d96cfa 100644
--- a/lib/controller/federation/federation_test.go
+++ b/lib/controller/federation/federation_test.go
@@ -10,13 +10,16 @@ import (
 	"os"
 	"testing"
 
+	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/lib/controller/router"
 	"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"
 	"git.arvados.org/arvados.git/sdk/go/httpserver"
+	"github.com/jmoiron/sqlx"
 	check "gopkg.in/check.v1"
 )
 
@@ -28,9 +31,18 @@ func Test(t *testing.T) {
 // FederationSuite does some generic setup/teardown. Don't add Test*
 // methods to FederationSuite itself.
 type FederationSuite struct {
-	cluster *arvados.Cluster
-	ctx     context.Context
-	fed     *Conn
+	integrationTestCluster *arvados.Cluster
+	cluster                *arvados.Cluster
+	ctx                    context.Context
+	tx                     *sqlx.Tx
+	fed                    *Conn
+}
+
+func (s *FederationSuite) SetUpSuite(c *check.C) {
+	cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
+	c.Assert(err, check.IsNil)
+	s.integrationTestCluster, err = cfg.GetCluster("")
+	c.Assert(err, check.IsNil)
 }
 
 func (s *FederationSuite) SetUpTest(c *check.C) {
@@ -38,23 +50,33 @@ func (s *FederationSuite) SetUpTest(c *check.C) {
 		ClusterID:       "aaaaa",
 		SystemRootToken: arvadostest.SystemRootToken,
 		RemoteClusters: map[string]arvados.RemoteCluster{
-			"aaaaa": arvados.RemoteCluster{
+			"aaaaa": {
 				Host: os.Getenv("ARVADOS_API_HOST"),
 			},
 		},
+		PostgreSQL: s.integrationTestCluster.PostgreSQL,
 	}
 	arvadostest.SetServiceURL(&s.cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST"))
 	s.cluster.TLS.Insecure = true
 	s.cluster.API.MaxItemsPerResponse = 3
 
+	tx, err := arvadostest.DB(c, s.cluster).Beginx()
+	c.Assert(err, check.IsNil)
+	s.tx = tx
+
 	ctx := context.Background()
 	ctx = ctxlog.Context(ctx, ctxlog.TestLogger(c))
 	ctx = auth.NewContext(ctx, &auth.Credentials{Tokens: []string{arvadostest.ActiveTokenV2}})
+	ctx = ctrlctx.NewWithTransaction(ctx, s.tx)
 	s.ctx = ctx
 
 	s.fed = New(s.cluster)
 }
 
+func (s *FederationSuite) TearDownTest(c *check.C) {
+	s.tx.Rollback()
+}
+
 func (s *FederationSuite) addDirectRemote(c *check.C, id string, backend backend) {
 	s.cluster.RemoteClusters[id] = arvados.RemoteCluster{
 		Host: "in-process.local",
@@ -64,7 +86,7 @@ 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)
+	srv.Handler = router.New(backend, router.Config{})
 	c.Check(srv.Start(), check.IsNil)
 	s.cluster.RemoteClusters[id] = arvados.RemoteCluster{
 		Scheme: "http",