X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9c2fb29f2c493fad7bfe15d3aa93ce3a24b0aa72..1c4a2d386dc0d2a85c86171801c6681d76fb12fe:/lib/controller/router/router_test.go diff --git a/lib/controller/router/router_test.go b/lib/controller/router/router_test.go index 701d53a26c..4cabe70f16 100644 --- a/lib/controller/router/router_test.go +++ b/lib/controller/router/router_test.go @@ -16,9 +16,9 @@ import ( "testing" "time" - "git.curoverse.com/arvados.git/lib/controller/rpc" - "git.curoverse.com/arvados.git/sdk/go/arvados" - "git.curoverse.com/arvados.git/sdk/go/arvadostest" + "git.arvados.org/arvados.git/lib/controller/rpc" + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/arvadostest" "github.com/gorilla/mux" check "gopkg.in/check.v1" ) @@ -286,6 +286,12 @@ func (s *RouterIntegrationSuite) TestContainerLock(c *check.C) { c.Check(jresp["uuid"], check.IsNil) } +func (s *RouterIntegrationSuite) TestWritableBy(c *check.C) { + _, rr, jresp := doRequest(c, s.rtr, arvadostest.ActiveTokenV2, "GET", `/arvados/v1/users/`+arvadostest.ActiveUserUUID, nil, nil) + c.Check(rr.Code, check.Equals, http.StatusOK) + c.Check(jresp["writable_by"], check.DeepEquals, []interface{}{"zzzzz-tpzed-000000000000000", "zzzzz-tpzed-xurymjxw79nv3jz", "zzzzz-j7d0g-48foin4vonvc2at"}) +} + func (s *RouterIntegrationSuite) TestFullTimestampsInResponse(c *check.C) { uuid := arvadostest.CollectionReplicationDesired2Confirmed2UUID token := arvadostest.ActiveTokenV2 @@ -321,6 +327,8 @@ func (s *RouterIntegrationSuite) TestSelectParam(c *check.C) { c.Check(rr.Code, check.Equals, http.StatusOK) c.Check(resp["kind"], check.Equals, "arvados#container") + c.Check(resp["etag"], check.FitsTypeOf, "") + c.Check(resp["etag"], check.Not(check.Equals), "") c.Check(resp["uuid"], check.HasLen, 27) c.Check(resp["command"], check.HasLen, 2) c.Check(resp["mounts"], check.IsNil) @@ -329,6 +337,11 @@ func (s *RouterIntegrationSuite) TestSelectParam(c *check.C) { } } +func (s *RouterIntegrationSuite) TestHEAD(c *check.C) { + _, rr, _ := doRequest(c, s.rtr, arvadostest.ActiveTokenV2, "HEAD", "/arvados/v1/containers/"+arvadostest.QueuedContainerUUID, nil, nil) + c.Check(rr.Code, check.Equals, http.StatusOK) +} + func (s *RouterIntegrationSuite) TestRouteNotFound(c *check.C) { token := arvadostest.ActiveTokenV2 req := (&testReq{