14717: Refactor run_test_server.py and run_test.sh to use config.yml

[arvados.git] / services / ws / server_test.go

diff --git a/services/ws/server_test.go b/services/ws/server_test.go
index ca57f9faab5a1d1c10f32fba78ec3ee3cc68c957..1b9a50ca6742c85978ce8a512117070995501c11 100644 (file)
--- a/services/ws/server_test.go
+++ b/services/ws/server_test.go
@@ -36,7 +36,6 @@ func (s *serverSuite) SetUpTest(c *check.C) {
 
 func (*serverSuite) testConfig() (*arvados.Cluster, error) {
        ldr := config.NewLoader(nil, nil)
-       ldr.LegacyComponentConfig = "ws-test"
        cfg, err := ldr.Load()
        if err != nil {
                return nil, err
@@ -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")