X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/72a8b3582d925ea30fe78697ff76bafb20d8bd9e..18fecbe7ae84981626f8532c3f3ac730a50ce02a:/services/ws/server_test.go

diff --git a/services/ws/server_test.go b/services/ws/server_test.go
index ca57f9faab..88279ec9b2 100644
--- a/services/ws/server_test.go
+++ b/services/ws/server_test.go
@@ -7,15 +7,15 @@ package main
 import (
 	"encoding/json"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"os"
 	"sync"
 	"time"
 
-	"git.curoverse.com/arvados.git/lib/config"
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
+	"git.arvados.org/arvados.git/lib/config"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvadostest"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	check "gopkg.in/check.v1"
 )
 
@@ -29,14 +29,13 @@ type serverSuite struct {
 
 func (s *serverSuite) SetUpTest(c *check.C) {
 	var err error
-	s.cluster, err = s.testConfig()
+	s.cluster, err = s.testConfig(c)
 	c.Assert(err, check.IsNil)
 	s.srv = &server{cluster: s.cluster}
 }
 
-func (*serverSuite) testConfig() (*arvados.Cluster, error) {
-	ldr := config.NewLoader(nil, nil)
-	ldr.LegacyComponentConfig = "ws-test"
+func (*serverSuite) testConfig(c *check.C) (*arvados.Cluster, error) {
+	ldr := config.NewLoader(nil, ctxlog.TestLogger(c))
 	cfg, err := ldr.Load()
 	if err != nil {
 		return nil, err
@@ -164,16 +163,16 @@ ManagementToken: qqqqq
 `)
 	tmpfile, err := ioutil.TempFile("", "example")
 	if err != nil {
-		log.Fatal(err)
+		c.Error(err)
 	}
 
 	defer os.Remove(tmpfile.Name()) // clean up
 
 	if _, err := tmpfile.Write(content); err != nil {
-		log.Fatal(err)
+		c.Error(err)
 	}
 	if err := tmpfile.Close(); err != nil {
-		log.Fatal(err)
+		c.Error(err)
 
 	}
 	cluster := configure(logger(nil), []string{"arvados-ws", "-config", tmpfile.Name()})
@@ -182,13 +181,19 @@ ManagementToken: qqqqq
 	c.Check(cluster.Services.Controller.ExternalURL, check.Equals, arvados.URL{Scheme: "https", Host: "example.com"})
 	c.Check(cluster.SystemRootToken, check.Equals, "abcdefg")
 
-	c.Check(cluster.PostgreSQL.Connection.String(), check.Equals, "connect_timeout='30' dbname='arvados_production' fallback_application_name='arvados-ws' host='localhost' password='xyzzy' sslmode='require' user='arvados' ")
+	c.Check(cluster.PostgreSQL.Connection, check.DeepEquals, arvados.PostgreSQLConnection{
+		"connect_timeout":           "30",
+		"dbname":                    "arvados_production",
+		"fallback_application_name": "arvados-ws",
+		"host":                      "localhost",
+		"password":                  "xyzzy",
+		"sslmode":                   "require",
+		"user":                      "arvados"})
 	c.Check(cluster.PostgreSQL.ConnectionPool, check.Equals, 63)
-	c.Check(cluster.Services.Websocket.InternalURLs, check.DeepEquals, map[arvados.URL]arvados.ServiceInstance{
-		arvados.URL{Host: ":8765"}: arvados.ServiceInstance{}})
+	c.Check(cluster.Services.Websocket.InternalURLs[arvados.URL{Host: ":8765"}], check.NotNil)
 	c.Check(cluster.SystemLogs.LogLevel, check.Equals, "debug")
 	c.Check(cluster.SystemLogs.Format, check.Equals, "text")
-	c.Check(cluster.API.WebsocketKeepaliveTimeout, check.Equals, arvados.Duration(61*time.Second))
+	c.Check(cluster.API.SendTimeout, check.Equals, arvados.Duration(61*time.Second))
 	c.Check(cluster.API.WebsocketClientEventQueue, check.Equals, 62)
 	c.Check(cluster.API.WebsocketServerEventQueue, check.Equals, 5)
 	c.Check(cluster.ManagementToken, check.Equals, "qqqqq")