X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/142953f3b9f4a7da5bd456c3e0c6ee93d0f54055..9833a2b9be1a722bd9aad08baf48ca072bde7ca7:/sdk/go/arvadosclient/arvadosclient_test.go

diff --git a/sdk/go/arvadosclient/arvadosclient_test.go b/sdk/go/arvadosclient/arvadosclient_test.go
index 045acf81e7..fc686ad637 100644
--- a/sdk/go/arvadosclient/arvadosclient_test.go
+++ b/sdk/go/arvadosclient/arvadosclient_test.go
@@ -1,14 +1,18 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package arvadosclient
 
 import (
 	"fmt"
-	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
-	. "gopkg.in/check.v1"
 	"net"
 	"net/http"
 	"os"
 	"testing"
-	"time"
+
+	"git.arvados.org/arvados.git/sdk/go/arvadostest"
+	. "gopkg.in/check.v1"
 )
 
 // Gocheck boilerplate
@@ -29,31 +33,37 @@ func (s *ServerRequiredSuite) SetUpSuite(c *C) {
 	RetryDelay = 0
 }
 
+func (s *ServerRequiredSuite) TearDownSuite(c *C) {
+	arvadostest.StopKeep(2)
+	arvadostest.StopAPI()
+}
+
 func (s *ServerRequiredSuite) SetUpTest(c *C) {
 	arvadostest.ResetEnv()
 }
 
 func (s *ServerRequiredSuite) TestMakeArvadosClientSecure(c *C) {
 	os.Setenv("ARVADOS_API_HOST_INSECURE", "")
-	kc, err := MakeArvadosClient()
+	ac, err := MakeArvadosClient()
 	c.Assert(err, Equals, nil)
-	c.Check(kc.ApiServer, Equals, os.Getenv("ARVADOS_API_HOST"))
-	c.Check(kc.ApiToken, Equals, os.Getenv("ARVADOS_API_TOKEN"))
-	c.Check(kc.ApiInsecure, Equals, false)
+	c.Check(ac.ApiServer, Equals, os.Getenv("ARVADOS_API_HOST"))
+	c.Check(ac.ApiToken, Equals, os.Getenv("ARVADOS_API_TOKEN"))
+	c.Check(ac.ApiInsecure, Equals, false)
 }
 
 func (s *ServerRequiredSuite) TestMakeArvadosClientInsecure(c *C) {
 	os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
-	kc, err := MakeArvadosClient()
+	ac, err := MakeArvadosClient()
 	c.Assert(err, Equals, nil)
-	c.Check(kc.ApiInsecure, Equals, true)
-	c.Check(kc.ApiServer, Equals, os.Getenv("ARVADOS_API_HOST"))
-	c.Check(kc.ApiToken, Equals, os.Getenv("ARVADOS_API_TOKEN"))
-	c.Check(kc.Client.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify, Equals, true)
+	c.Check(ac.ApiInsecure, Equals, true)
+	c.Check(ac.ApiServer, Equals, os.Getenv("ARVADOS_API_HOST"))
+	c.Check(ac.ApiToken, Equals, os.Getenv("ARVADOS_API_TOKEN"))
+	c.Check(ac.Client.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify, Equals, true)
 }
 
 func (s *ServerRequiredSuite) TestGetInvalidUUID(c *C) {
 	arv, err := MakeArvadosClient()
+	c.Assert(err, IsNil)
 
 	getback := make(Dict)
 	err = arv.Get("collections", "", nil, &getback)
@@ -71,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)
@@ -86,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)
@@ -104,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()
 
@@ -163,7 +126,7 @@ func (s *ServerRequiredSuite) TestErrorResponse(c *C) {
 			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, ErrorMatches, ".*unknown attribute(: | ')bogus_attr.*")
 		c.Assert(err, FitsTypeOf, APIServerError{})
 		c.Assert(err.(APIServerError).HttpStatusCode, Equals, 422)
 	}
@@ -181,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)
@@ -188,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)
@@ -258,8 +223,17 @@ type APIStub struct {
 }
 
 func (h *APIStub) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
-	resp.WriteHeader(h.respStatus[h.retryAttempts])
-	resp.Write([]byte(h.responseBody[h.retryAttempts]))
+	if req.URL.Path == "/redirect-loop" {
+		http.Redirect(resp, req, "/redirect-loop", http.StatusFound)
+		return
+	}
+	if h.respStatus[h.retryAttempts] < 0 {
+		// Fail the client's Do() by starting a redirect loop
+		http.Redirect(resp, req, "/redirect-loop", http.StatusFound)
+	} else {
+		resp.WriteHeader(h.respStatus[h.retryAttempts])
+		resp.Write([]byte(h.responseBody[h.retryAttempts]))
+	}
 	h.retryAttempts++
 }
 
@@ -313,13 +287,18 @@ func (s *MockArvadosServerSuite) TestWithRetries(c *C) {
 		{
 			"get", 0, 401, []int{500, 401, 200}, []string{``, ``, `{"ok":"ok"}`},
 		},
-		// Use nil responseBody to simulate error during request processing
-		// Even though retryable, the simulated error applies during reties also, and hence "get" also eventually fails in this test.
+
+		// Response code -1 simulates an HTTP/network error
+		// (i.e., Do() returns an error; there is no HTTP
+		// response status code).
+
+		// Succeed on second retry
 		{
-			"get", 0, -1, nil, nil,
+			"get", 0, 200, []int{-1, -1, 200}, []string{``, ``, `{"ok":"ok"}`},
 		},
+		// "POST" is not safe to retry: fail after one error
 		{
-			"create", 0, -1, nil, nil,
+			"create", 0, -1, []int{-1, 200}, []string{``, `{"ok":"ok"}`},
 		},
 	} {
 		api, err := RunFakeArvadosServer(&stub)
@@ -335,12 +314,6 @@ func (s *MockArvadosServerSuite) TestWithRetries(c *C) {
 			Client:      &http.Client{Transport: &http.Transport{}},
 			Retries:     2}
 
-		// We use nil responseBody to look for errors during request processing
-		// Simulate an error using https (but the arv.Client transport used does not support it)
-		if stub.responseBody == nil {
-			arv.Scheme = "https"
-		}
-
 		getback := make(Dict)
 		switch stub.method {
 		case "get":
@@ -357,18 +330,17 @@ func (s *MockArvadosServerSuite) TestWithRetries(c *C) {
 			err = arv.Delete("pipeline_templates", "zzzzz-4zz18-znfnqtbbv4spc3w", nil, &getback)
 		}
 
-		if stub.expected == 200 {
+		switch stub.expected {
+		case 200:
 			c.Check(err, IsNil)
-			c.Assert(getback["ok"], Equals, "ok")
-		} else {
+			c.Check(getback["ok"], Equals, "ok")
+		case -1:
 			c.Check(err, NotNil)
-
-			if stub.responseBody == nil { // test uses empty responseBody to look for errors during request processing
-				c.Assert(err, ErrorMatches, "* oversized record received.*")
-			} else {
-				c.Assert(err, ErrorMatches, fmt.Sprintf("%s%d.*", "arvados API server error: ", stub.expected))
-				c.Assert(err.(APIServerError).HttpStatusCode, Equals, stub.expected)
-			}
+			c.Check(err, ErrorMatches, `.*stopped after \d+ redirects`)
+		default:
+			c.Check(err, NotNil)
+			c.Check(err, ErrorMatches, fmt.Sprintf("arvados API server error: %d.*", stub.expected))
+			c.Check(err.(APIServerError).HttpStatusCode, Equals, stub.expected)
 		}
 	}
 }