X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/711711827bb0c3564836707bb7d4453c60c6a98c..ba56503f90d099a215fb7375f5cb1cc1ac667e2c:/lib/controller/server_test.go

diff --git a/lib/controller/server_test.go b/lib/controller/server_test.go
index 7742cf4eae..e3558c3f41 100644
--- a/lib/controller/server_test.go
+++ b/lib/controller/server_test.go
@@ -5,28 +5,18 @@
 package controller
 
 import (
-	"bytes"
+	"context"
 	"net/http"
 	"os"
 	"path/filepath"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/httpserver"
-	"github.com/Sirupsen/logrus"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvadostest"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
+	"git.arvados.org/arvados.git/sdk/go/httpserver"
 	check "gopkg.in/check.v1"
 )
 
-// logWriter is an io.Writer that writes by calling a "write log"
-// function, typically (*check.C)Log().
-type logWriter struct {
-	logfunc func(...interface{})
-}
-
-func (tl *logWriter) Write(buf []byte) (int, error) {
-	tl.logfunc(string(bytes.TrimRight(buf, "\n")))
-	return len(buf), nil
-}
-
 func integrationTestCluster() *arvados.Cluster {
 	cfg, err := arvados.GetConfig(filepath.Join(os.Getenv("WORKSPACE"), "tmp", "arvados.yml"))
 	if err != nil {
@@ -42,27 +32,23 @@ func integrationTestCluster() *arvados.Cluster {
 // Return a new unstarted controller server, using the Rails API
 // provided by the integration-testing environment.
 func newServerFromIntegrationTestEnv(c *check.C) *httpserver.Server {
-	log := logrus.New()
-	log.Formatter = &logrus.JSONFormatter{}
-	log.Out = &logWriter{c.Log}
+	log := ctxlog.TestLogger(c)
 
-	nodeProfile := arvados.NodeProfile{
-		Controller: arvados.SystemServiceInstance{Listen: ":"},
-		RailsAPI:   arvados.SystemServiceInstance{Listen: os.Getenv("ARVADOS_TEST_API_HOST"), TLS: true, Insecure: true},
-	}
 	handler := &Handler{Cluster: &arvados.Cluster{
 		ClusterID:  "zzzzz",
 		PostgreSQL: integrationTestCluster().PostgreSQL,
-		NodeProfiles: map[string]arvados.NodeProfile{
-			"*": nodeProfile,
-		},
-	}, NodeProfile: &nodeProfile}
+	}}
+	handler.Cluster.TLS.Insecure = true
+	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.AddRequestIDs(httpserver.LogRequests(log, handler)),
+			Handler: httpserver.HandlerWithContext(
+				ctxlog.Context(context.Background(), log),
+				httpserver.AddRequestIDs(httpserver.LogRequests(handler))),
 		},
-		Addr: nodeProfile.Controller.Listen,
+		Addr: ":",
 	}
 	return srv
 }