Fix cases caught by linter

mafredri · mafredri · commit f1fb0af79583 · 2022-07-29T15:16:04.000+03:00
diff --git a/cli/list_test.go b/cli/list_test.go
@@ -3,12 +3,12 @@ package cli_test
 import (
 	"context"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
+	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/pty/ptytest"
 )
 
@@ -29,7 +29,7 @@ func TestList(t *testing.T) {
 		cmd.SetIn(pty.Input())
 		cmd.SetOut(pty.Output())
 
-		ctx, cancelFunc := context.WithTimeout(context.Background(), 5*time.Second)
+		ctx, cancelFunc := context.WithTimeout(context.Background(), testutil.WaitLong)
 		defer cancelFunc()
 		done := make(chan any)
 		go func() {
diff --git a/cli/server_test.go b/cli/server_test.go
@@ -213,7 +213,7 @@ func TestServer(t *testing.T) {
 				},
 			},
 		}
-		_, err = client.HasFirstUser(ctx)
+		_, err := client.HasFirstUser(ctx)
 		require.NoError(t, err)
 
 		cancelFunc()
diff --git a/coderd/provisionerjobs_internal_test.go b/coderd/provisionerjobs_internal_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/coderd/database/databasefake"
 	"github.com/coder/coder/codersdk"
+	"github.com/coder/coder/internal/testutil"
 )
 
 func TestProvisionerJobLogs_Unit(t *testing.T) {
@@ -63,7 +64,7 @@ func TestProvisionerJobLogs_Unit(t *testing.T) {
 			{ID: uuid.New(), JobID: jobID, Stage: "Stage3"},
 		}
 
-		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
 		defer cancel()
 
 		// wow there are a lot of DB rows we touch...

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ func TestServer(t *testing.T) {`
`213`	`213`	`},`
`214`	`214`	`},`
`215`	`215`	`}`
`216`		`- _, err = client.HasFirstUser(ctx)`
	`216`	`+ _, err := client.HasFirstUser(ctx)`
`217`	`217`	`require.NoError(t, err)`
`218`	`218`
`219`	`219`	`cancelFunc()`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import (`
`21`	`21`	`"github.com/coder/coder/coderd/database"`
`22`	`22`	`"github.com/coder/coder/coderd/database/databasefake"`
`23`	`23`	`"github.com/coder/coder/codersdk"`
	`24`	`+ "github.com/coder/coder/internal/testutil"`
`24`	`25`	`)`
`25`	`26`
`26`	`27`	`func TestProvisionerJobLogs_Unit(t *testing.T) {`
`@@ -63,7 +64,7 @@ func TestProvisionerJobLogs_Unit(t *testing.T) {`
`63`	`64`	`{ID: uuid.New(), JobID: jobID, Stage: "Stage3"},`
`64`	`65`	`}`
`65`	`66`
`66`		`- ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)`
	`67`	`+ ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)`
`67`	`68`	`defer cancel()`
`68`	`69`
`69`	`70`	`// wow there are a lot of DB rows we touch...`