X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b6d7efab2c4bffa3fabd55b166e44cca8ac1391f..365b9ca0ea4291d9864297593d185aeef66457ba:/lib/controller/server_test.go

diff --git a/lib/controller/server_test.go b/lib/controller/server_test.go
index 838de35563..b2b3365a20 100644
--- a/lib/controller/server_test.go
+++ b/lib/controller/server_test.go
@@ -6,9 +6,11 @@ package controller
 
 import (
 	"context"
+	"net"
 	"net/http"
 	"os"
 	"path/filepath"
+	"time"
 
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/arvadostest"
@@ -35,19 +37,22 @@ func newServerFromIntegrationTestEnv(c *check.C) *httpserver.Server {
 	log := ctxlog.TestLogger(c)
 
 	handler := &Handler{Cluster: &arvados.Cluster{
-		ClusterID:        "zzzzz",
-		PostgreSQL:       integrationTestCluster().PostgreSQL,
-		ForceLegacyAPI14: forceLegacyAPI14,
+		ClusterID:  "zzzzz",
+		PostgreSQL: integrationTestCluster().PostgreSQL,
 	}}
 	handler.Cluster.TLS.Insecure = true
+	handler.Cluster.Collections.BlobSigning = true
+	handler.Cluster.Collections.BlobSigningKey = arvadostest.BlobSigningKey
+	handler.Cluster.Collections.BlobSigningTTL = arvados.Duration(time.Hour * 24 * 14)
 	arvadostest.SetServiceURL(&handler.Cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST"))
 	arvadostest.SetServiceURL(&handler.Cluster.Services.Controller, "http://localhost:/")
 
 	srv := &httpserver.Server{
 		Server: http.Server{
-			Handler: httpserver.HandlerWithContext(
-				ctxlog.Context(context.Background(), log),
-				httpserver.AddRequestIDs(httpserver.LogRequests(handler))),
+			BaseContext: func(net.Listener) context.Context {
+				return ctxlog.Context(context.Background(), log)
+			},
+			Handler: httpserver.AddRequestIDs(httpserver.LogRequests(handler)),
 		},
 		Addr: ":",
 	}