Fix more ineffassign warnings.

[arvados.git] / sdk / go / arvadosclient / arvadosclient_test.go

diff --git a/sdk/go/arvadosclient/arvadosclient_test.go b/sdk/go/arvadosclient/arvadosclient_test.go
index 372f09d14bb14f929a40020523c75da69617cdbc..fc686ad63739e51340d5e254f8f68d65ac4db3e7 100644 (file)
--- a/sdk/go/arvadosclient/arvadosclient_test.go
+++ b/sdk/go/arvadosclient/arvadosclient_test.go
@@ -10,9 +10,8 @@ import (
        "net/http"
        "os"
        "testing"
-       "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvadostest"
+       "git.arvados.org/arvados.git/sdk/go/arvadostest"
        . "gopkg.in/check.v1"
 )
 
@@ -64,6 +63,7 @@ func (s *ServerRequiredSuite) TestMakeArvadosClientInsecure(c *C) {
 
 func (s *ServerRequiredSuite) TestGetInvalidUUID(c *C) {
        arv, err := MakeArvadosClient()
+       c.Assert(err, IsNil)
 
        getback := make(Dict)
        err = arv.Get("collections", "", nil, &getback)
@@ -81,6 +81,7 @@ func (s *ServerRequiredSuite) TestGetInvalidUUID(c *C) {
 
 func (s *ServerRequiredSuite) TestGetValidUUID(c *C) {
        arv, err := MakeArvadosClient()
+       c.Assert(err, IsNil)
 
        getback := make(Dict)
        err = arv.Get("collections", "zzzzz-4zz18-abcdeabcdeabcde", nil, &getback)
@@ -96,6 +97,7 @@ func (s *ServerRequiredSuite) TestGetValidUUID(c *C) {
 
 func (s *ServerRequiredSuite) TestInvalidResourceType(c *C) {
        arv, err := MakeArvadosClient()
+       c.Assert(err, IsNil)
 
        getback := make(Dict)
        err = arv.Get("unicorns", "zzzzz-zebra-unicorn7unicorn", nil, &getback)
@@ -114,55 +116,6 @@ func (s *ServerRequiredSuite) TestInvalidResourceType(c *C) {
        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) {
        arv, _ := MakeArvadosClient()
 
@@ -191,6 +144,7 @@ func (s *ServerRequiredSuite) TestErrorResponse(c *C) {
 
 func (s *ServerRequiredSuite) TestAPIDiscovery_Get_defaultCollectionReplication(c *C) {
        arv, err := MakeArvadosClient()
+       c.Assert(err, IsNil)
        value, err := arv.Discovery("defaultCollectionReplication")
        c.Assert(err, IsNil)
        c.Assert(value, NotNil)
@@ -198,6 +152,7 @@ func (s *ServerRequiredSuite) TestAPIDiscovery_Get_defaultCollectionReplication(
 
 func (s *ServerRequiredSuite) TestAPIDiscovery_Get_noSuchParameter(c *C) {
        arv, err := MakeArvadosClient()
+       c.Assert(err, IsNil)
        value, err := arv.Discovery("noSuchParameter")
        c.Assert(err, NotNil)
        c.Assert(value, IsNil)