X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/711711827bb0c3564836707bb7d4453c60c6a98c..7db74f672f64b3e647a98c1d8e5978b50d79538d:/services/ws/event_source_test.go

diff --git a/services/ws/event_source_test.go b/services/ws/event_source_test.go
index ac5d130d61..d02b199939 100644
--- a/services/ws/event_source_test.go
+++ b/services/ws/event_source_test.go
@@ -2,17 +2,17 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package ws
 
 import (
 	"database/sql"
 	"fmt"
-	"os"
-	"path/filepath"
 	"sync"
 	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
+	"github.com/prometheus/client_golang/prometheus"
 	check "gopkg.in/check.v1"
 )
 
@@ -21,7 +21,7 @@ var _ = check.Suite(&eventSourceSuite{})
 type eventSourceSuite struct{}
 
 func testDBConfig() arvados.PostgreSQLConnection {
-	cfg, err := arvados.GetConfig(filepath.Join(os.Getenv("WORKSPACE"), "tmp", "arvados.yml"))
+	cfg, err := arvados.GetConfig(arvados.DefaultConfigFile)
 	if err != nil {
 		panic(err)
 	}
@@ -46,6 +46,8 @@ func (*eventSourceSuite) TestEventSource(c *check.C) {
 	pges := &pgEventSource{
 		DataSource: cfg.String(),
 		QueueSize:  4,
+		Logger:     ctxlog.TestLogger(c),
+		Reg:        prometheus.NewRegistry(),
 	}
 	go pges.Run()
 	sinks := make([]eventSink, 18)
@@ -78,14 +80,14 @@ func (*eventSourceSuite) TestEventSource(c *check.C) {
 			for i := 0; i <= si; i++ {
 				ev := <-sinks[si].Channel()
 				c.Logf("sink %d received event %d", si, i)
-				c.Check(ev.LogID, check.Equals, uint64(i))
+				c.Check(ev.LogID, check.Equals, int64(i))
 				row := ev.Detail()
 				if i == 0 {
 					// no matching row, null event
 					c.Check(row, check.IsNil)
 				} else {
 					c.Check(row, check.NotNil)
-					c.Check(row.ID, check.Equals, uint64(i))
+					c.Check(row.ID, check.Equals, int64(i))
 					c.Check(row.UUID, check.Not(check.Equals), "")
 				}
 			}