5538: much simpler and neater api stub test case array; golint

diff --git a/sdk/go/arvadosclient/arvadosclient.go b/sdk/go/arvadosclient/arvadosclient.go
index 68c0632a309a1215bf93d03664f51c9d37bb4c67..2b6a36abec5edca9aae9f71f11860e50e0856753 100644 (file)
--- a/sdk/go/arvadosclient/arvadosclient.go
+++ b/sdk/go/arvadosclient/arvadosclient.go
@@ -228,9 +228,8 @@ func (c ArvadosClient) CallRaw(method string, resourceType string, uuid string,
 
        if resp != nil {
                return nil, newAPIServerError(c.ApiServer, resp)
-       } else {
-               return nil, err
        }
+       return nil, err
 }
 
 func newAPIServerError(ServerAddress string, resp *http.Response) APIServerError {

diff --git a/sdk/go/arvadosclient/arvadosclient_test.go b/sdk/go/arvadosclient/arvadosclient_test.go
index a9c2c83cf6e93c6f25010514cadc80157ce909ac..a4fe136af541362281e3d207a3fc93edaf5fc136 100644 (file)
--- a/sdk/go/arvadosclient/arvadosclient_test.go
+++ b/sdk/go/arvadosclient/arvadosclient_test.go
@@ -7,7 +7,6 @@ import (
        "net"
        "net/http"
        "os"
-       "strconv"
        "strings"
        "testing"
        "time"
@@ -251,11 +250,6 @@ func RunFakeArvadosServer(st http.Handler) (api APIServer, err error) {
        return
 }
 
-type APIStub struct {
-       count      int
-       respStatus []int
-}
-
 func (h *APIStub) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
        resp.WriteHeader(h.respStatus[h.count])
 
@@ -265,46 +259,57 @@ func (h *APIStub) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
                resp.Write([]byte(``))
        }
 
-       h.count += 1
+       h.count++
+}
+
+type APIStub struct {
+       method       string
+       count        int
+       expected     int
+       respStatus   []int
+       responseBody []string
 }
 
 func (s *MockArvadosServerSuite) TestWithRetries(c *C) {
-       // Each testCase below specifies the operation to be used ("get", "create" etc),
-       // the "expected" outcome (500 or 401 or success etc,
-       // and an array of response statuses to be returned in that order for each (re)try.
-       //
-       // The tests are using retry count of 2,
-       // and hence the first "non-retryable" code (such as 401)
-       // or whatever is the third status code is to be expected.
-       for _, testCase := range []map[string][]int{
-               {"get:500": []int{500, 500, 500, 200}},
-               {"create:500": []int{500, 500, 500, 200}},
-               {"update:500": []int{500, 500, 500, 200}},
-               {"delete:500": []int{500, 500, 500, 200}},
-               {"get:502": []int{500, 500, 502, 200}},
-               {"create:502": []int{500, 500, 502, 200}},
-               {"get:success": []int{500, 500, 200}},
-               {"create:success": []int{500, 500, 200}},
-               {"get:401": []int{401, 200}},
-               {"create:401": []int{401, 200}},
-               {"get:404": []int{404, 200}},
-               {"create:404": []int{404, 200}},
-               {"get:401": []int{500, 401, 200}},
-               {"create:401": []int{500, 401, 200}},
+       for _, stub := range []APIStub{
+               {
+                       "get", 0, 500, []int{500, 500, 500, 200}, []string{``, ``, ``, `{"ok":"ok"}`},
+               },
+               {
+                       "create", 0, 500, []int{500, 500, 500, 200}, []string{``, ``, ``, `{"ok":"ok"}`},
+               },
+               {
+                       "update", 0, 500, []int{500, 500, 500, 200}, []string{``, ``, ``, `{"ok":"ok"}`},
+               },
+               {
+                       "delete", 0, 500, []int{500, 500, 500, 200}, []string{``, ``, ``, `{"ok":"ok"}`},
+               },
+               {
+                       "get", 0, 502, []int{500, 500, 502, 200}, []string{``, ``, ``, `{"ok":"ok"}`},
+               },
+               {
+                       "create", 0, 502, []int{500, 500, 502, 200}, []string{``, ``, ``, `{"ok":"ok"}`},
+               },
+               {
+                       "get", 0, 200, []int{500, 500, 200}, []string{``, ``, `{"ok":"ok"}`},
+               },
+               {
+                       "create", 0, 200, []int{500, 500, 200}, []string{``, ``, `{"ok":"ok"}`},
+               },
+               {
+                       "get", 0, 401, []int{401, 200}, []string{``, `{"ok":"ok"}`},
+               },
+               {
+                       "create", 0, 401, []int{401, 200}, []string{``, `{"ok":"ok"}`},
+               },
+               {
+                       "get", 0, 404, []int{404, 200}, []string{``, `{"ok":"ok"}`},
+               },
+               {
+                       "get", 0, 401, []int{500, 401, 200}, []string{``, ``, `{"ok":"ok"}`},
+               },
        } {
-               var method string
-               var statusCodes []int
-               var expected string
-
-               for key, value := range testCase {
-                       method = key[:strings.Index(key, ":")]
-                       expected = key[strings.Index(key, ":")+1:]
-                       statusCodes = value
-               }
-
-               stub := &APIStub{0, statusCodes}
-
-               api, err := RunFakeArvadosServer(stub)
+               api, err := RunFakeArvadosServer(&stub)
                c.Check(err, IsNil)
 
                defer api.listener.Close()
@@ -318,7 +323,7 @@ func (s *MockArvadosServerSuite) TestWithRetries(c *C) {
                        Retries:     2}
 
                getback := make(Dict)
-               switch method {
+               switch stub.method {
                case "get":
                        err = arv.Get("collections", "zzzzz-4zz18-znfnqtbbv4spc3w", nil, &getback)
                case "create":
@@ -333,14 +338,13 @@ func (s *MockArvadosServerSuite) TestWithRetries(c *C) {
                        err = arv.Delete("pipeline_templates", "zzzzz-4zz18-znfnqtbbv4spc3w", nil, &getback)
                }
 
-               if expected == "success" {
+               if stub.expected == 200 {
                        c.Check(err, IsNil)
                        c.Assert(getback["ok"], Equals, "ok")
                } else {
                        c.Check(err, NotNil)
-                       expectedStatus, _ := strconv.Atoi(expected)
-                       c.Check(strings.Contains(err.Error(), fmt.Sprintf("%s%s", "arvados API server error: ", expected)), Equals, true)
-                       c.Assert(err.(APIServerError).HttpStatusCode, Equals, expectedStatus)
+                       c.Check(strings.Contains(err.Error(), fmt.Sprintf("%s%d", "arvados API server error: ", stub.expected)), Equals, true)
+                       c.Assert(err.(APIServerError).HttpStatusCode, Equals, stub.expected)
                }
        }
 }