Avoid nginx startup race in test suite.

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

diff --git a/services/ws/server_test.go b/services/ws/server_test.go
index 7eef27258b58b1c2b9a3d81b8ece6f4b35ffa019..3da571e69651cc597d5816391eef82de6f0f810b 100644 (file)
--- a/services/ws/server_test.go
+++ b/services/ws/server_test.go
@@ -15,6 +15,7 @@ import (
        "git.curoverse.com/arvados.git/lib/config"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/arvadostest"
+       "git.curoverse.com/arvados.git/sdk/go/ctxlog"
        check "gopkg.in/check.v1"
 )
 
@@ -28,13 +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)
+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