X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/de5f63b3abc80783ebe886078c5e4bcfa19ed1da..af6d31cba8346ac86bc0027eb0f675144fb43056:/sdk/go/arvadosclient/arvadosclient_test.go?ds=sidebyside

diff --git a/sdk/go/arvadosclient/arvadosclient_test.go b/sdk/go/arvadosclient/arvadosclient_test.go
index f7d0cc9af7..75af3ca519 100644
--- a/sdk/go/arvadosclient/arvadosclient_test.go
+++ b/sdk/go/arvadosclient/arvadosclient_test.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"os"
 	"testing"
+	"time"
 )
 
 // Gocheck boilerplate
@@ -14,13 +15,14 @@ func Test(t *testing.T) {
 }
 
 var _ = Suite(&ServerRequiredSuite{})
+var _ = Suite(&UnitSuite{})
 
 // Tests that require the Keep server running
 type ServerRequiredSuite struct{}
 
 func (s *ServerRequiredSuite) SetUpSuite(c *C) {
 	arvadostest.StartAPI()
-	arvadostest.StartKeep()
+	arvadostest.StartKeep(2, false)
 }
 
 func (s *ServerRequiredSuite) SetUpTest(c *C) {
@@ -46,35 +48,105 @@ func (s *ServerRequiredSuite) TestMakeArvadosClientInsecure(c *C) {
 	c.Check(kc.Client.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify, Equals, true)
 }
 
-func (s *ServerRequiredSuite) TestCreatePipelineTemplate(c *C) {
+func (s *ServerRequiredSuite) TestGetInvalidUUID(c *C) {
 	arv, err := MakeArvadosClient()
 
 	getback := make(Dict)
-	err = arv.Create("pipeline_templates",
-		Dict{"pipeline_template": Dict{
-			"name": "tmp",
-			"components": Dict{
-				"c1": map[string]string{"script": "script1"},
-				"c2": map[string]string{"script": "script2"}}}},
-		&getback)
-	c.Assert(err, Equals, nil)
-	c.Assert(getback["name"], Equals, "tmp")
-	c.Assert(getback["components"].(map[string]interface{})["c2"].(map[string]interface{})["script"], Equals, "script2")
-
-	uuid := getback["uuid"].(string)
-	getback = make(Dict)
-	err = arv.Update("pipeline_templates", uuid,
-		Dict{
-			"pipeline_template": Dict{"name": "tmp2"}},
-		&getback)
-	c.Assert(err, Equals, nil)
-	c.Assert(getback["name"], Equals, "tmp2")
+	err = arv.Get("collections", "", nil, &getback)
+	c.Assert(err, Equals, ErrInvalidArgument)
+	c.Assert(len(getback), Equals, 0)
 
-	c.Assert(getback["uuid"].(string), Equals, uuid)
-	getback = make(Dict)
-	err = arv.Delete("pipeline_templates", uuid, nil, &getback)
-	c.Assert(err, Equals, nil)
-	c.Assert(getback["name"], Equals, "tmp2")
+	err = arv.Get("collections", "zebra-moose-unicorn", nil, &getback)
+	c.Assert(err, Equals, ErrInvalidArgument)
+	c.Assert(len(getback), Equals, 0)
+
+	err = arv.Get("collections", "acbd18db4cc2f85cedef654fccc4a4d8", nil, &getback)
+	c.Assert(err, Equals, ErrInvalidArgument)
+	c.Assert(len(getback), Equals, 0)
+}
+
+func (s *ServerRequiredSuite) TestGetValidUUID(c *C) {
+	arv, err := MakeArvadosClient()
+
+	getback := make(Dict)
+	err = arv.Get("collections", "zzzzz-4zz18-abcdeabcdeabcde", nil, &getback)
+	c.Assert(err, FitsTypeOf, APIServerError{})
+	c.Assert(err.(APIServerError).HttpStatusCode, Equals, http.StatusNotFound)
+	c.Assert(len(getback), Equals, 0)
+
+	err = arv.Get("collections", "acbd18db4cc2f85cedef654fccc4a4d8+3", nil, &getback)
+	c.Assert(err, FitsTypeOf, APIServerError{})
+	c.Assert(err.(APIServerError).HttpStatusCode, Equals, http.StatusNotFound)
+	c.Assert(len(getback), Equals, 0)
+}
+
+func (s *ServerRequiredSuite) TestInvalidResourceType(c *C) {
+	arv, err := MakeArvadosClient()
+
+	getback := make(Dict)
+	err = arv.Get("unicorns", "zzzzz-zebra-unicorn7unicorn", nil, &getback)
+	c.Assert(err, FitsTypeOf, APIServerError{})
+	c.Assert(err.(APIServerError).HttpStatusCode, Equals, http.StatusNotFound)
+	c.Assert(len(getback), Equals, 0)
+
+	err = arv.Update("unicorns", "zzzzz-zebra-unicorn7unicorn", nil, &getback)
+	c.Assert(err, FitsTypeOf, APIServerError{})
+	c.Assert(err.(APIServerError).HttpStatusCode, Equals, http.StatusNotFound)
+	c.Assert(len(getback), Equals, 0)
+
+	err = arv.List("unicorns", nil, &getback)
+	c.Assert(err, FitsTypeOf, APIServerError{})
+	c.Assert(err.(APIServerError).HttpStatusCode, Equals, http.StatusNotFound)
+	c.Assert(len(getback), Equals, 0)
+}
+
+func (s *ServerRequiredSuite) TestCreatePipelineTemplate(c *C) {
+	arv, err := MakeArvadosClient()
+
+	for _, idleConnections := range []bool{
+		false,
+		true,
+	} {
+		if idleConnections {
+			arv.lastClosedIdlesAt = time.Now().Add(-time.Minute)
+		} else {
+			arv.lastClosedIdlesAt = time.Now()
+		}
+
+		getback := make(Dict)
+		err = arv.Create("pipeline_templates",
+			Dict{"pipeline_template": Dict{
+				"name": "tmp",
+				"components": Dict{
+					"c1": map[string]string{"script": "script1"},
+					"c2": map[string]string{"script": "script2"}}}},
+			&getback)
+		c.Assert(err, Equals, nil)
+		c.Assert(getback["name"], Equals, "tmp")
+		c.Assert(getback["components"].(map[string]interface{})["c2"].(map[string]interface{})["script"], Equals, "script2")
+
+		uuid := getback["uuid"].(string)
+
+		getback = make(Dict)
+		err = arv.Get("pipeline_templates", uuid, nil, &getback)
+		c.Assert(err, Equals, nil)
+		c.Assert(getback["name"], Equals, "tmp")
+		c.Assert(getback["components"].(map[string]interface{})["c1"].(map[string]interface{})["script"], Equals, "script1")
+
+		getback = make(Dict)
+		err = arv.Update("pipeline_templates", uuid,
+			Dict{
+				"pipeline_template": Dict{"name": "tmp2"}},
+			&getback)
+		c.Assert(err, Equals, nil)
+		c.Assert(getback["name"], Equals, "tmp2")
+
+		c.Assert(getback["uuid"].(string), Equals, uuid)
+		getback = make(Dict)
+		err = arv.Delete("pipeline_templates", uuid, nil, &getback)
+		c.Assert(err, Equals, nil)
+		c.Assert(getback["name"], Equals, "tmp2")
+	}
 }
 
 func (s *ServerRequiredSuite) TestErrorResponse(c *C) {
@@ -86,17 +158,63 @@ func (s *ServerRequiredSuite) TestErrorResponse(c *C) {
 		err := arv.Create("logs",
 			Dict{"log": Dict{"bogus_attr": "foo"}},
 			&getback)
+		c.Assert(err, ErrorMatches, "arvados API server error: .*")
 		c.Assert(err, ErrorMatches, ".*unknown attribute: bogus_attr.*")
-		c.Assert(err, FitsTypeOf, RemoteApiServerError{})
-		c.Assert(err.(RemoteApiServerError).HttpStatusCode, Equals, 422)
+		c.Assert(err, FitsTypeOf, APIServerError{})
+		c.Assert(err.(APIServerError).HttpStatusCode, Equals, 422)
 	}
 
 	{
 		err := arv.Create("bogus",
 			Dict{"bogus": Dict{}},
 			&getback)
+		c.Assert(err, ErrorMatches, "arvados API server error: .*")
 		c.Assert(err, ErrorMatches, ".*Path not found.*")
-		c.Assert(err, FitsTypeOf, RemoteApiServerError{})
-		c.Assert(err.(RemoteApiServerError).HttpStatusCode, Equals, 404)
+		c.Assert(err, FitsTypeOf, APIServerError{})
+		c.Assert(err.(APIServerError).HttpStatusCode, Equals, 404)
 	}
 }
+
+func (s *ServerRequiredSuite) TestAPIDiscovery_Get_defaultCollectionReplication(c *C) {
+	arv, err := MakeArvadosClient()
+	value, err := arv.Discovery("defaultCollectionReplication")
+	c.Assert(err, IsNil)
+	c.Assert(value, NotNil)
+}
+
+func (s *ServerRequiredSuite) TestAPIDiscovery_Get_noSuchParameter(c *C) {
+	arv, err := MakeArvadosClient()
+	value, err := arv.Discovery("noSuchParameter")
+	c.Assert(err, NotNil)
+	c.Assert(value, IsNil)
+}
+
+type UnitSuite struct{}
+
+func (s *UnitSuite) TestUUIDMatch(c *C) {
+	c.Assert(UUIDMatch("zzzzz-tpzed-000000000000000"), Equals, true)
+	c.Assert(UUIDMatch("zzzzz-zebra-000000000000000"), Equals, true)
+	c.Assert(UUIDMatch("00000-00000-zzzzzzzzzzzzzzz"), Equals, true)
+	c.Assert(UUIDMatch("ZEBRA-HORSE-AFRICANELEPHANT"), Equals, false)
+	c.Assert(UUIDMatch(" zzzzz-tpzed-000000000000000"), Equals, false)
+	c.Assert(UUIDMatch("d41d8cd98f00b204e9800998ecf8427e"), Equals, false)
+	c.Assert(UUIDMatch("d41d8cd98f00b204e9800998ecf8427e+0"), Equals, false)
+	c.Assert(UUIDMatch(""), Equals, false)
+}
+
+func (s *UnitSuite) TestPDHMatch(c *C) {
+	c.Assert(PDHMatch("zzzzz-tpzed-000000000000000"), Equals, false)
+	c.Assert(PDHMatch("d41d8cd98f00b204e9800998ecf8427e"), Equals, false)
+	c.Assert(PDHMatch("d41d8cd98f00b204e9800998ecf8427e+0"), Equals, true)
+	c.Assert(PDHMatch("d41d8cd98f00b204e9800998ecf8427e+12345"), Equals, true)
+	c.Assert(PDHMatch("d41d8cd98f00b204e9800998ecf8427e 12345"), Equals, false)
+	c.Assert(PDHMatch("D41D8CD98F00B204E9800998ECF8427E+12345"), Equals, false)
+	c.Assert(PDHMatch("d41d8cd98f00b204e9800998ecf8427e+12345 "), Equals, false)
+	c.Assert(PDHMatch("d41d8cd98f00b204e9800998ecf8427e+abcdef"), Equals, false)
+	c.Assert(PDHMatch("da39a3ee5e6b4b0d3255bfef95601890afd80709"), Equals, false)
+	c.Assert(PDHMatch("da39a3ee5e6b4b0d3255bfef95601890afd80709+0"), Equals, false)
+	c.Assert(PDHMatch("d41d8cd98f00b204e9800998ecf8427+12345"), Equals, false)
+	c.Assert(PDHMatch("d41d8cd98f00b204e9800998ecf8427e+12345\n"), Equals, false)
+	c.Assert(PDHMatch("+12345"), Equals, false)
+	c.Assert(PDHMatch(""), Equals, false)
+}