16159: Provide a localdb transaction for federation tests.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/controller/federation/federation_test.go b/lib/controller/federation/federation_test.go
index 5079b402b7208d59bb78c0420b2da547a408b717..50f7eea42b3fe162de4282f009d31f162df5cd4f 100644 (file)
--- 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) {
@@ -42,19 +54,29 @@ func (s *FederationSuite) SetUpTest(c *check.C) {
                                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",

diff --git a/lib/controller/federation/login_test.go b/lib/controller/federation/login_test.go
index 007f5df8b4726c7f24ebbcdf3b6ac0c46a202fbd..5353ebf0f52ce7394b868838eb75e730945b4d8e 100644 (file)
--- a/lib/controller/federation/login_test.go
+++ b/lib/controller/federation/login_test.go
@@ -62,7 +62,7 @@ func (s *LoginSuite) TestLogout(c *check.C) {
                {token: "v2/zhome-aaaaa-aaaaaaaaaaaaaaa/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", returnTo: returnTo, target: "http://" + s.cluster.RemoteClusters["zhome"].Host + "/logout?" + url.Values{"return_to": {returnTo}}.Encode()},
        } {
                c.Logf("trial %#v", trial)
-               ctx := context.Background()
+               ctx := s.ctx
                if trial.token != "" {
                        ctx = auth.NewContext(ctx, &auth.Credentials{Tokens: []string{trial.token}})
                }