19972: Lint.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go
index fe0fca6b8cabf06a4430e78ab0976559b79aa71e..010963cfe79c0e151459e0ef3b8ad53e08a5997e 100644 (file)
--- a/lib/controller/rpc/conn.go
+++ b/lib/controller/rpc/conn.go
@@ -88,7 +88,8 @@ func (conn *Conn) requestAndDecode(ctx context.Context, dst interface{}, ep arva
                Scheme:     conn.baseURL.Scheme,
                APIHost:    conn.baseURL.Host,
                SendHeader: conn.SendHeader,
-               Timeout:    0, // disable auto-retry
+               // Disable auto-retry
+               Timeout: 0,
        }
        tokens, err := conn.tokenProvider(ctx)
        if err != nil {

diff --git a/lib/diagnostics/cmd.go b/lib/diagnostics/cmd.go
index 36dca86e59c2f284efcec4f7a0beb7dce6530974..8d89b84d37a6a8a7fb9789a3b0e06666974935d7 100644 (file)
--- a/lib/diagnostics/cmd.go
+++ b/lib/diagnostics/cmd.go
@@ -131,7 +131,8 @@ func (diag *diagnoser) dotest(id int, title string, fn func() error) {
 
 func (diag *diagnoser) runtests() {
        client := arvados.NewClientFromEnv()
-       client.Timeout = 0 // disable auto-retry, use context instead
+       // Disable auto-retry, use context instead
+       client.Timeout = 0
 
        if client.APIHost == "" || client.AuthToken == "" {
                diag.errorf("ARVADOS_API_HOST and ARVADOS_API_TOKEN environment variables are not set -- aborting without running any tests")

diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go
index 9d7d3736b05f15ac04c189bee9993b21bb8c35a1..7454b5784e54a8be36b5c4b027460b3bf72e3d08 100644 (file)
--- a/lib/dispatchcloud/dispatcher_test.go
+++ b/lib/dispatchcloud/dispatcher_test.go
@@ -102,7 +102,8 @@ func (s *DispatcherSuite) SetUpTest(c *check.C) {
 
        arvClient, err := arvados.NewClientFromConfig(s.cluster)
        c.Assert(err, check.IsNil)
-       arvClient.Timeout = 0 // disable auto-retry
+       // Disable auto-retry
+       arvClient.Timeout = 0
 
        s.error503Server = httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusServiceUnavailable) }))
        arvClient.Client = &http.Client{

diff --git a/services/ws/permission_test.go b/services/ws/permission_test.go
index 2e08cea484c0fd93403d85dd8295e7426edfeb21..5e90881a03d7bb1c076d79c0d24c59f612919803 100644 (file)
--- a/services/ws/permission_test.go
+++ b/services/ws/permission_test.go
@@ -18,7 +18,9 @@ type permSuite struct{}
 
 func (s *permSuite) TestCheck(c *check.C) {
        client := arvados.NewClientFromEnv()
-       client.Timeout = 0 // disable auto-retry
+       // Disable auto-retry
+       client.Timeout = 0
+
        pc := newPermChecker(*client).(*cachingPermChecker)
        setToken := func(label, token string) {
                c.Logf("...%s token %q", label, token)