[ARVADOS] updated: 1.3.0-1335-gb2df3cba9

Git user git at public.curoverse.com
Mon Jul 22 18:59:29 UTC 2019


Summary of changes:
 services/ws/server_test.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

       via  b2df3cba90166bc67dd93600ac1a44ac6f9e81bd (commit)
      from  d66a6a910fc37cd4452a62ac53052224c376b573 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b2df3cba90166bc67dd93600ac1a44ac6f9e81bd
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jul 22 14:53:18 2019 -0400

    14717: Fix ws tests
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/ws/server_test.go b/services/ws/server_test.go
index ca57f9faa..1d6231fe8 100644
--- a/services/ws/server_test.go
+++ b/services/ws/server_test.go
@@ -182,13 +182,20 @@ 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.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")

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list