[ARVADOS] updated: 1.3.0-1643-g28f250ee0
Git user
git at public.curoverse.com
Thu Sep 19 19:06:15 UTC 2019
Summary of changes:
services/arv-git-httpd/auth_handler_test.go | 3 ++-
services/arv-git-httpd/git_handler_test.go | 3 ++-
services/arv-git-httpd/gitolite_test.go | 3 ++-
services/arv-git-httpd/integration_test.go | 3 ++-
services/crunch-run/git_mount_test.go | 3 ++-
services/keep-web/handler_test.go | 3 ++-
services/keep-web/server_test.go | 3 ++-
services/keepproxy/keepproxy_test.go | 3 ++-
services/ws/server_test.go | 7 ++++---
9 files changed, 20 insertions(+), 11 deletions(-)
via 28f250ee0a43e873760d43b39119e5710de75fe8 (commit)
from 1b6b38c5d2e181f357cab883b63917cb5eaa778c (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 28f250ee0a43e873760d43b39119e5710de75fe8
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Sep 19 15:05:50 2019 -0400
13647: Fix nil loggers in test suites.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/services/arv-git-httpd/auth_handler_test.go b/services/arv-git-httpd/auth_handler_test.go
index 568570942..c4ebb37ed 100644
--- a/services/arv-git-httpd/auth_handler_test.go
+++ b/services/arv-git-httpd/auth_handler_test.go
@@ -16,6 +16,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"
)
@@ -38,7 +39,7 @@ func (s *AuthHandlerSuite) SetUpTest(c *check.C) {
repoRoot, err := filepath.Abs("../api/tmp/git/test")
c.Assert(err, check.IsNil)
- cfg, err := config.NewLoader(nil, nil).Load()
+ cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
c.Assert(err, check.Equals, nil)
s.cluster, err = cfg.GetCluster("")
c.Assert(err, check.Equals, nil)
diff --git a/services/arv-git-httpd/git_handler_test.go b/services/arv-git-httpd/git_handler_test.go
index d5cb275fd..1a4a984fb 100644
--- a/services/arv-git-httpd/git_handler_test.go
+++ b/services/arv-git-httpd/git_handler_test.go
@@ -12,6 +12,7 @@ import (
"git.curoverse.com/arvados.git/lib/config"
"git.curoverse.com/arvados.git/sdk/go/arvados"
+ "git.curoverse.com/arvados.git/sdk/go/ctxlog"
check "gopkg.in/check.v1"
)
@@ -22,7 +23,7 @@ type GitHandlerSuite struct {
}
func (s *GitHandlerSuite) SetUpTest(c *check.C) {
- cfg, err := config.NewLoader(nil, nil).Load()
+ cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
c.Assert(err, check.Equals, nil)
s.cluster, err = cfg.GetCluster("")
c.Assert(err, check.Equals, nil)
diff --git a/services/arv-git-httpd/gitolite_test.go b/services/arv-git-httpd/gitolite_test.go
index eaa7b55f8..45a1e60ff 100644
--- a/services/arv-git-httpd/gitolite_test.go
+++ b/services/arv-git-httpd/gitolite_test.go
@@ -12,6 +12,7 @@ import (
"git.curoverse.com/arvados.git/lib/config"
"git.curoverse.com/arvados.git/sdk/go/arvados"
+ "git.curoverse.com/arvados.git/sdk/go/ctxlog"
check "gopkg.in/check.v1"
)
@@ -48,7 +49,7 @@ func (s *GitoliteSuite) SetUpTest(c *check.C) {
s.tmpRepoRoot = s.gitoliteHome + "/repositories"
- cfg, err := config.NewLoader(nil, nil).Load()
+ cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
c.Assert(err, check.Equals, nil)
s.cluster, err = cfg.GetCluster("")
c.Assert(err, check.Equals, nil)
diff --git a/services/arv-git-httpd/integration_test.go b/services/arv-git-httpd/integration_test.go
index 46bf8329c..a408dd475 100644
--- a/services/arv-git-httpd/integration_test.go
+++ b/services/arv-git-httpd/integration_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"
)
@@ -62,7 +63,7 @@ func (s *IntegrationSuite) SetUpTest(c *check.C) {
c.Assert(err, check.Equals, nil)
if s.cluster == nil {
- cfg, err := config.NewLoader(nil, nil).Load()
+ cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
c.Assert(err, check.Equals, nil)
s.cluster, err = cfg.GetCluster("")
c.Assert(err, check.Equals, nil)
diff --git a/services/crunch-run/git_mount_test.go b/services/crunch-run/git_mount_test.go
index 5796ad7a2..61ee24c91 100644
--- a/services/crunch-run/git_mount_test.go
+++ b/services/crunch-run/git_mount_test.go
@@ -13,6 +13,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"
git_client "gopkg.in/src-d/go-git.v4/plumbing/transport/client"
git_http "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
@@ -205,7 +206,7 @@ func (s *GitMountSuite) checkTmpdirContents(c *check.C, expect []string) {
func (*GitMountSuite) useTestGitServer(c *check.C) {
git_client.InstallProtocol("https", git_http.NewClient(arvados.InsecureHTTPClient))
- loader := config.NewLoader(nil, nil)
+ loader := config.NewLoader(nil, ctxlog.TestLogger(c))
cfg, err := loader.Load()
c.Assert(err, check.IsNil)
cluster, err := cfg.GetCluster("")
diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go
index 1090151e1..34333d434 100644
--- a/services/keep-web/handler_test.go
+++ b/services/keep-web/handler_test.go
@@ -21,6 +21,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
"git.curoverse.com/arvados.git/sdk/go/auth"
+ "git.curoverse.com/arvados.git/sdk/go/ctxlog"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
check "gopkg.in/check.v1"
)
@@ -32,7 +33,7 @@ type UnitSuite struct {
}
func (s *UnitSuite) SetUpTest(c *check.C) {
- ldr := config.NewLoader(bytes.NewBufferString("Clusters: {zzzzz: {}}"), nil)
+ ldr := config.NewLoader(bytes.NewBufferString("Clusters: {zzzzz: {}}"), ctxlog.TestLogger(c))
ldr.Path = "-"
cfg, err := ldr.Load()
c.Assert(err, check.IsNil)
diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go
index b856090ca..0d2e776f1 100644
--- a/services/keep-web/server_test.go
+++ b/services/keep-web/server_test.go
@@ -22,6 +22,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
+ "git.curoverse.com/arvados.git/sdk/go/ctxlog"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
check "gopkg.in/check.v1"
)
@@ -429,7 +430,7 @@ func (s *IntegrationSuite) TearDownSuite(c *check.C) {
func (s *IntegrationSuite) SetUpTest(c *check.C) {
arvadostest.ResetEnv()
- ldr := config.NewLoader(bytes.NewBufferString("Clusters: {zzzzz: {}}"), nil)
+ ldr := config.NewLoader(bytes.NewBufferString("Clusters: {zzzzz: {}}"), ctxlog.TestLogger(c))
ldr.Path = "-"
arvCfg, err := ldr.Load()
c.Check(err, check.IsNil)
diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index d2758cc25..a6a73c831 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -22,6 +22,7 @@ import (
"git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
+ "git.curoverse.com/arvados.git/sdk/go/ctxlog"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
log "github.com/sirupsen/logrus"
@@ -99,7 +100,7 @@ func (s *NoKeepServerSuite) TearDownSuite(c *C) {
}
func runProxy(c *C, bogusClientToken bool) *keepclient.KeepClient {
- cfg, err := config.NewLoader(nil, nil).Load()
+ cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
c.Assert(err, Equals, nil)
cluster, err := cfg.GetCluster("")
c.Assert(err, Equals, nil)
diff --git a/services/ws/server_test.go b/services/ws/server_test.go
index 7eef27258..3da571e69 100644
--- 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
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list