From 5eb512e7b6ff3a0d9f14591fe6bf611dde5cc27c Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Mon, 12 Aug 2019 15:42:41 -0300 Subject: [PATCH] 14716: Removes test config loading func that short-circuited load mechanism. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- services/keep-web/handler_test.go | 5 +++-- services/keep-web/server_test.go | 37 +++++++++++++++++-------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/services/keep-web/handler_test.go b/services/keep-web/handler_test.go index fe8e767c4c..ba0f768358 100644 --- a/services/keep-web/handler_test.go +++ b/services/keep-web/handler_test.go @@ -31,8 +31,9 @@ type UnitSuite struct { } func (s *UnitSuite) SetUpTest(c *check.C) { - ldr := config.NewLoader(nil, nil) - cfg, err := ldr.LoadDefaults() + ldr := config.NewLoader(bytes.NewBufferString("Clusters: {zzzzz: {}}"), nil) + ldr.Path = "-" + cfg, err := ldr.Load() c.Assert(err, check.IsNil) s.Config = cfg } diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go index 12596b16bb..0607a76651 100644 --- a/services/keep-web/server_test.go +++ b/services/keep-web/server_test.go @@ -5,6 +5,7 @@ package main import ( + "bytes" "crypto/md5" "encoding/json" "fmt" @@ -408,21 +409,6 @@ func (s *IntegrationSuite) TestMetrics(c *check.C) { c.Check(resp.StatusCode, check.Equals, http.StatusNotFound) } -func (s *IntegrationSuite) SetUpSuite(c *check.C) { - arvadostest.StartAPI() - arvadostest.StartKeep(2, true) - - arv, err := arvadosclient.MakeArvadosClient() - c.Assert(err, check.Equals, nil) - arv.ApiToken = arvadostest.ActiveToken - kc, err := keepclient.MakeKeepClient(arv) - c.Assert(err, check.Equals, nil) - kc.PutB([]byte("Hello world\n")) - kc.PutB([]byte("foo")) - kc.PutB([]byte("foobar")) - kc.PutB([]byte("waz")) -} - func (s *UnitSuite) TestLegacyConfig(c *check.C) { content := []byte(` { @@ -483,6 +469,21 @@ func (s *UnitSuite) TestLegacyConfig(c *check.C) { c.Check(cfg.cluster.ManagementToken, check.Equals, "xyzzy") } +func (s *IntegrationSuite) SetUpSuite(c *check.C) { + arvadostest.StartAPI() + arvadostest.StartKeep(2, true) + + arv, err := arvadosclient.MakeArvadosClient() + c.Assert(err, check.Equals, nil) + arv.ApiToken = arvadostest.ActiveToken + kc, err := keepclient.MakeKeepClient(arv) + c.Assert(err, check.Equals, nil) + kc.PutB([]byte("Hello world\n")) + kc.PutB([]byte("foo")) + kc.PutB([]byte("foobar")) + kc.PutB([]byte("waz")) +} + func (s *IntegrationSuite) TearDownSuite(c *check.C) { arvadostest.StopKeep(2) arvadostest.StopAPI() @@ -490,8 +491,10 @@ func (s *IntegrationSuite) TearDownSuite(c *check.C) { func (s *IntegrationSuite) SetUpTest(c *check.C) { arvadostest.ResetEnv() - ldr := config.NewLoader(nil, nil) - arvCfg, err := ldr.LoadDefaults() + ldr := config.NewLoader(bytes.NewBufferString("Clusters: {zzzzz: {}}"), nil) + ldr.Path = "-" + arvCfg, err := ldr.Load() + c.Check(err, check.IsNil) cfg := DefaultConfig(arvCfg) c.Assert(err, check.IsNil) cfg.Client = arvados.Client{ -- 2.30.2