X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b53513423ab948804425424278ac554870864997..91ebfb6d3812313dfa13caa75a6e5fb426c0d519:/services/keepproxy/keepproxy_test.go diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go index 8242f5b2b5..4e53797d80 100644 --- a/services/keepproxy/keepproxy_test.go +++ b/services/keepproxy/keepproxy_test.go @@ -146,7 +146,6 @@ func runProxy(c *C, bogusClientToken bool, loadKeepstoresFromConfig bool, kp *ar TestProxyUUID: "http://" + srv.Addr, } kc.SetServiceRoots(sr, sr, sr) - kc.Arvados.External = true return srv, kc, logbuf } @@ -608,22 +607,22 @@ func (s *ServerRequiredSuite) TestStripHint(c *C) { } // Test GetIndex -// Put one block, with 2 replicas -// With no prefix (expect the block locator, twice) -// With an existing prefix (expect the block locator, twice) -// With a valid but non-existing prefix (expect "\n") -// With an invalid prefix (expect error) +// - Put one block, with 2 replicas +// - With no prefix (expect the block locator, twice) +// - With an existing prefix (expect the block locator, twice) +// - With a valid but non-existing prefix (expect "\n") +// - With an invalid prefix (expect error) func (s *ServerRequiredSuite) TestGetIndex(c *C) { getIndexWorker(c, false) } // Test GetIndex -// Uses config.yml -// Put one block, with 2 replicas -// With no prefix (expect the block locator, twice) -// With an existing prefix (expect the block locator, twice) -// With a valid but non-existing prefix (expect "\n") -// With an invalid prefix (expect error) +// - Uses config.yml +// - Put one block, with 2 replicas +// - With no prefix (expect the block locator, twice) +// - With an existing prefix (expect the block locator, twice) +// - With a valid but non-existing prefix (expect "\n") +// - With an invalid prefix (expect error) func (s *ServerRequiredConfigYmlSuite) TestGetIndex(c *C) { getIndexWorker(c, true) } @@ -696,7 +695,7 @@ func (s *ServerRequiredSuite) TestCollectionSharingToken(c *C) { defer srv.Close() hash, _, err := kc.PutB([]byte("shareddata")) c.Check(err, IsNil) - kc.Arvados.ApiToken = arvadostest.FooCollectionSharingToken + kc.Arvados.ApiToken = arvadostest.FooFileCollectionSharingToken rdr, _, _, err := kc.Get(hash) c.Assert(err, IsNil) data, err := ioutil.ReadAll(rdr)