chore: Move testutil from internal to root

mafredri · mafredri · commit 422e72b23072 · 2022-08-01T13:09:09.000+03:00
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -33,12 +33,12 @@ import (
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/agent"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/peer"
 	"github.com/coder/coder/peerbroker"
 	"github.com/coder/coder/peerbroker/proto"
 	"github.com/coder/coder/provisionersdk"
 	"github.com/coder/coder/pty/ptytest"
+	"github.com/coder/coder/testutil"
 )
 
 func TestMain(m *testing.M) {
diff --git a/agent/reaper/reaper_test.go b/agent/reaper/reaper_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/agent/reaper"
-	"github.com/coder/coder/internal/testutil"
+	"github.com/coder/coder/testutil"
 )
 
 func TestReap(t *testing.T) {
diff --git a/cli/cliui/prompt_test.go b/cli/cliui/prompt_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/cli/cliui"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/pty"
 	"github.com/coder/coder/pty/ptytest"
+	"github.com/coder/coder/testutil"
 )
 
 func TestPrompt(t *testing.T) {
diff --git a/cli/create_test.go b/cli/create_test.go
@@ -13,10 +13,10 @@ import (
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
 	"github.com/coder/coder/pty/ptytest"
+	"github.com/coder/coder/testutil"
 )
 
 func TestCreate(t *testing.T) {
diff --git a/cli/list_test.go b/cli/list_test.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/pty/ptytest"
+	"github.com/coder/coder/testutil"
 )
 
 func TestList(t *testing.T) {
diff --git a/cli/portforward_test.go b/cli/portforward_test.go
@@ -21,9 +21,9 @@ import (
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
+	"github.com/coder/coder/testutil"
 )
 
 func TestPortForward(t *testing.T) {
diff --git a/cli/resetpassword_test.go b/cli/resetpassword_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/database/postgres"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/pty/ptytest"
+	"github.com/coder/coder/testutil"
 )
 
 // nolint:paralleltest
diff --git a/cli/server_test.go b/cli/server_test.go
@@ -30,8 +30,8 @@ import (
 	"github.com/coder/coder/coderd/database/postgres"
 	"github.com/coder/coder/coderd/telemetry"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/pty/ptytest"
+	"github.com/coder/coder/testutil"
 )
 
 // This cannot be ran in parallel because it uses a signal.
diff --git a/cli/ssh_test.go b/cli/ssh_test.go
@@ -26,10 +26,10 @@ import (
 	"github.com/coder/coder/cli/clitest"
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
 	"github.com/coder/coder/pty/ptytest"
+	"github.com/coder/coder/testutil"
 )
 
 func setupWorkspaceForSSH(t *testing.T) (*codersdk.Client, codersdk.Workspace, string) {
diff --git a/coderd/coderd_test.go b/coderd/coderd_test.go
@@ -38,9 +38,9 @@ import (
 	"github.com/coder/coder/coderd/telemetry"
 	"github.com/coder/coder/coderd/turnconn"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
+	"github.com/coder/coder/testutil"
 )
 
 func TestMain(m *testing.M) {
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
@@ -52,11 +52,11 @@ import (
 	"github.com/coder/coder/coderd/util/ptr"
 	"github.com/coder/coder/codersdk"
 	"github.com/coder/coder/cryptorand"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionerd"
 	"github.com/coder/coder/provisionersdk"
 	"github.com/coder/coder/provisionersdk/proto"
+	"github.com/coder/coder/testutil"
 )
 
 type Options struct {
diff --git a/coderd/devtunnel/tunnel_test.go b/coderd/devtunnel/tunnel_test.go
@@ -25,7 +25,7 @@ import (
 
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/coderd/devtunnel"
-	"github.com/coder/coder/internal/testutil"
+	"github.com/coder/coder/testutil"
 )
 
 const (
diff --git a/coderd/httpmw/ratelimit_test.go b/coderd/httpmw/ratelimit_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/coderd/httpmw"
-	"github.com/coder/coder/internal/testutil"
+	"github.com/coder/coder/testutil"
 )
 
 func TestRateLimit(t *testing.T) {
diff --git a/coderd/provisionerdaemons_test.go b/coderd/provisionerdaemons_test.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/provisionersdk"
+	"github.com/coder/coder/testutil"
 )
 
 func TestProvisionerDaemons(t *testing.T) {
diff --git a/coderd/provisionerjobs_internal_test.go b/coderd/provisionerjobs_internal_test.go
@@ -21,7 +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"
+	"github.com/coder/coder/testutil"
 )
 
 func TestProvisionerJobLogs_Unit(t *testing.T) {
diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
@@ -12,9 +12,9 @@ import (
 
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
+	"github.com/coder/coder/testutil"
 )
 
 func TestTemplateVersion(t *testing.T) {
diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go
@@ -15,9 +15,9 @@ import (
 	"github.com/coder/coder/coderd/coderdtest"
 	"github.com/coder/coder/coderd/database"
 	"github.com/coder/coder/codersdk"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/provisioner/echo"
 	"github.com/coder/coder/provisionersdk/proto"
+	"github.com/coder/coder/testutil"
 )
 
 func TestWorkspaceBuild(t *testing.T) {
diff --git a/peer/conn_test.go b/peer/conn_test.go
@@ -20,8 +20,8 @@ import (
 
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/peer"
+	"github.com/coder/coder/testutil"
 )
 
 var (
diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go
@@ -12,8 +12,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/provisionerd/runner"
+	"github.com/coder/coder/testutil"
 
 	"github.com/hashicorp/yamux"
 	"github.com/stretchr/testify/assert"
diff --git a/pty/ptytest/ptytest.go b/pty/ptytest/ptytest.go
@@ -16,8 +16,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
 
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/pty"
+	"github.com/coder/coder/testutil"
 )
 
 func New(t *testing.T) *PTY {
diff --git a/scripts/rules.go b/scripts/rules.go
@@ -88,7 +88,7 @@ func doNotCallTFailNowInsideGoroutine(m dsl.Matcher) {
 func useStandardTimeoutsAndDelaysInTests(m dsl.Matcher) {
 	m.Import("github.com/stretchr/testify/require")
 	m.Import("github.com/stretchr/testify/assert")
-	m.Import("github.com/coder/coder/internal/testutil")
+	m.Import("github.com/coder/coder/testutil")
 
 	m.Match(`context.WithTimeout($ctx, $duration)`).
 		Where(m.File().Imports("testing") && !m["duration"].Text.Matches("^testutil\\.")).
diff --git a/site/site_test.go b/site/site_test.go
@@ -19,8 +19,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/coder/coder/internal/testutil"
 	"github.com/coder/coder/site"
+	"github.com/coder/coder/testutil"
 )
 
 func TestCaching(t *testing.T) {
diff --git a/testutil/duration.go b/testutil/duration.go
diff --git a/testutil/duration_windows.go b/testutil/duration_windows.go

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/stretchr/testify/require"`
`13`	`13`
`14`	`14`	`"github.com/coder/coder/agent/reaper"`
`15`		`- "github.com/coder/coder/internal/testutil"`
	`15`	`+ "github.com/coder/coder/testutil"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func TestReap(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@ import (`
`13`	`13`	`"github.com/stretchr/testify/require"`
`14`	`14`
`15`	`15`	`"github.com/coder/coder/cli/cliui"`
`16`		`- "github.com/coder/coder/internal/testutil"`
`17`	`16`	`"github.com/coder/coder/pty"`
`18`	`17`	`"github.com/coder/coder/pty/ptytest"`
	`18`	`+ "github.com/coder/coder/testutil"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`func TestPrompt(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/coder/coder/cli/clitest"`
`10`	`10`	`"github.com/coder/coder/coderd/coderdtest"`
`11`		`- "github.com/coder/coder/internal/testutil"`
`12`	`11`	`"github.com/coder/coder/pty/ptytest"`
	`12`	`+ "github.com/coder/coder/testutil"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestList(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ import (`
`12`	`12`	`"github.com/coder/coder/cli/clitest"`
`13`	`13`	`"github.com/coder/coder/coderd/database/postgres"`
`14`	`14`	`"github.com/coder/coder/codersdk"`
`15`		`- "github.com/coder/coder/internal/testutil"`
`16`	`15`	`"github.com/coder/coder/pty/ptytest"`
	`16`	`+ "github.com/coder/coder/testutil"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`// nolint:paralleltest`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ import (`
`30`	`30`	`"github.com/coder/coder/coderd/database/postgres"`
`31`	`31`	`"github.com/coder/coder/coderd/telemetry"`
`32`	`32`	`"github.com/coder/coder/codersdk"`
`33`		`- "github.com/coder/coder/internal/testutil"`
`34`	`33`	`"github.com/coder/coder/pty/ptytest"`
	`34`	`+ "github.com/coder/coder/testutil"`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`// This cannot be ran in parallel because it uses a signal.`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`
`26`	`26`	`"cdr.dev/slog/sloggers/slogtest"`
`27`	`27`	`"github.com/coder/coder/coderd/devtunnel"`
`28`		`- "github.com/coder/coder/internal/testutil"`
	`28`	`+ "github.com/coder/coder/testutil"`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/stretchr/testify/require"`
`10`	`10`
`11`	`11`	`"github.com/coder/coder/coderd/httpmw"`
`12`		`- "github.com/coder/coder/internal/testutil"`
	`12`	`+ "github.com/coder/coder/testutil"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func TestRateLimit(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/coder/coder/coderd/coderdtest"`
`13`	`13`	`"github.com/coder/coder/codersdk"`
`14`		`- "github.com/coder/coder/internal/testutil"`
`15`	`14`	`"github.com/coder/coder/provisionersdk"`
	`15`	`+ "github.com/coder/coder/testutil"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`func TestProvisionerDaemons(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +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`	`+ "github.com/coder/coder/testutil"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func TestProvisionerJobLogs_Unit(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ import (`
`12`	`12`
`13`	`13`	`"github.com/coder/coder/coderd/coderdtest"`
`14`	`14`	`"github.com/coder/coder/codersdk"`
`15`		`- "github.com/coder/coder/internal/testutil"`
`16`	`15`	`"github.com/coder/coder/provisioner/echo"`
`17`	`16`	`"github.com/coder/coder/provisionersdk/proto"`
	`17`	`+ "github.com/coder/coder/testutil"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`func TestTemplateVersion(t *testing.T) {`