X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7c3e13d4876a8e37feffee3cdaebc44b20b7b61b..273e436dbf8736869dde715e9bc04a20c169d63f:/services/keepproxy/keepproxy_test.go diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go index d2758cc25f..aa32356806 100644 --- a/services/keepproxy/keepproxy_test.go +++ b/services/keepproxy/keepproxy_test.go @@ -18,11 +18,12 @@ import ( "testing" "time" - "git.curoverse.com/arvados.git/lib/config" - "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/keepclient" + "git.arvados.org/arvados.git/lib/config" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvadosclient" + "git.arvados.org/arvados.git/sdk/go/arvadostest" + "git.arvados.org/arvados.git/sdk/go/ctxlog" + "git.arvados.org/arvados.git/sdk/go/keepclient" log "github.com/sirupsen/logrus" . "gopkg.in/check.v1" @@ -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) @@ -141,6 +142,7 @@ func (s *ServerRequiredSuite) TestResponseViaHeader(c *C) { resp, err := (&http.Client{}).Do(req) c.Assert(err, Equals, nil) c.Check(resp.Header.Get("Via"), Equals, "HTTP/1.1 keepproxy") + c.Assert(resp.StatusCode, Equals, http.StatusOK) locator, err := ioutil.ReadAll(resp.Body) c.Assert(err, Equals, nil) resp.Body.Close() @@ -484,7 +486,7 @@ func (s *ServerRequiredSuite) TestGetIndex(c *C) { _, _, err = kc.PutB([]byte("some-more-index-data")) c.Check(err, IsNil) - kc.Arvados.ApiToken = arvadostest.DataManagerToken + kc.Arvados.ApiToken = arvadostest.SystemRootToken // Invoke GetIndex for _, spec := range []struct {