From 47d1bc31bf9ee554665881c562ca2dea9acf9e22 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Fri, 10 Mar 2023 13:37:51 -0500 Subject: [PATCH] 19972: Lint. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/controller/rpc/conn.go | 3 ++- lib/diagnostics/cmd.go | 3 ++- lib/dispatchcloud/dispatcher_test.go | 3 ++- services/ws/permission_test.go | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/controller/rpc/conn.go b/lib/controller/rpc/conn.go index fe0fca6b8c..010963cfe7 100644 --- 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 36dca86e59..8d89b84d37 100644 --- 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 9d7d3736b0..7454b5784e 100644 --- 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 2e08cea484..5e90881a03 100644 --- 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) -- 2.39.5