From 3f4351ee228ce263ae9af5d45c5fb71e249819b6 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Mon, 25 Jul 2022 12:58:08 +0300 Subject: [PATCH 1/2] fix: Set cache dir for coderd in codedtest --- coderd/coderdtest/coderdtest.go | 1 + 1 file changed, 1 insertion(+) diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go index eb5d089201a63..aa0aaba238a56 100644 --- a/coderd/coderdtest/coderdtest.go +++ b/coderd/coderdtest/coderdtest.go @@ -175,6 +175,7 @@ func newWithCloser(t *testing.T, options *Options) (*codersdk.Client, io.Closer) AgentInactiveDisconnectTimeout: 5 * time.Second, AccessURL: serverURL, Logger: slogtest.Make(t, nil).Leveled(slog.LevelDebug), + CacheDir: t.TempDir(), Database: db, Pubsub: pubsub, From 96e371074b2f81b87476c4da3b3219cabb58c493 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Mon, 25 Jul 2022 13:34:30 +0300 Subject: [PATCH 2/2] fix: Ensure server cli tests have a cache path To avoid sharing default path. --- cli/resetpassword_test.go | 7 +++- cli/server_test.go | 86 ++++++++++++++++++++++++++++++++------- 2 files changed, 78 insertions(+), 15 deletions(-) diff --git a/cli/resetpassword_test.go b/cli/resetpassword_test.go index 3bae7752e5a4f..6499e30a2481b 100644 --- a/cli/resetpassword_test.go +++ b/cli/resetpassword_test.go @@ -38,7 +38,12 @@ func TestResetPassword(t *testing.T) { defer closeFunc() ctx, cancelFunc := context.WithCancel(context.Background()) serverDone := make(chan struct{}) - serverCmd, cfg := clitest.New(t, "server", "--address", ":0", "--postgres-url", connectionURL) + serverCmd, cfg := clitest.New(t, + "server", + "--address", ":0", + "--postgres-url", connectionURL, + "--cache-dir", t.TempDir(), + ) go func() { defer close(serverDone) err = serverCmd.ExecuteContext(ctx) diff --git a/cli/server_test.go b/cli/server_test.go index 6d924088439e7..197f21b0c87f0 100644 --- a/cli/server_test.go +++ b/cli/server_test.go @@ -45,7 +45,12 @@ func TestServer(t *testing.T) { defer closeFunc() ctx, cancelFunc := context.WithCancel(context.Background()) defer cancelFunc() - root, cfg := clitest.New(t, "server", "--address", ":0", "--postgres-url", connectionURL) + root, cfg := clitest.New(t, + "server", + "--address", ":0", + "--postgres-url", connectionURL, + "--cache-dir", t.TempDir(), + ) errC := make(chan error) go func() { errC <- root.ExecuteContext(ctx) @@ -75,7 +80,11 @@ func TestServer(t *testing.T) { t.SkipNow() } ctx, cancelFunc := context.WithCancel(context.Background()) - root, cfg := clitest.New(t, "server", "--address", ":0") + root, cfg := clitest.New(t, + "server", + "--address", ":0", + "--cache-dir", t.TempDir(), + ) errC := make(chan error) go func() { errC <- root.ExecuteContext(ctx) @@ -102,7 +111,13 @@ func TestServer(t *testing.T) { ctx, cancelFunc := context.WithCancel(context.Background()) defer cancelFunc() - root, cfg := clitest.New(t, "server", "--in-memory", "--address", ":0", "--access-url", "http://1.2.3.4:3000/") + root, cfg := clitest.New(t, + "server", + "--in-memory", + "--address", ":0", + "--access-url", "http://1.2.3.4:3000/", + "--cache-dir", t.TempDir(), + ) var buf strings.Builder errC := make(chan error) root.SetOutput(&buf) @@ -127,8 +142,14 @@ func TestServer(t *testing.T) { t.Parallel() ctx, cancelFunc := context.WithCancel(context.Background()) defer cancelFunc() - root, _ := clitest.New(t, "server", "--in-memory", "--address", ":0", - "--tls-enable", "--tls-min-version", "tls9") + root, _ := clitest.New(t, + "server", + "--in-memory", + "--address", ":0", + "--tls-enable", + "--tls-min-version", "tls9", + "--cache-dir", t.TempDir(), + ) err := root.ExecuteContext(ctx) require.Error(t, err) }) @@ -136,8 +157,14 @@ func TestServer(t *testing.T) { t.Parallel() ctx, cancelFunc := context.WithCancel(context.Background()) defer cancelFunc() - root, _ := clitest.New(t, "server", "--in-memory", "--address", ":0", - "--tls-enable", "--tls-client-auth", "something") + root, _ := clitest.New(t, + "server", + "--in-memory", + "--address", ":0", + "--tls-enable", + "--tls-client-auth", "something", + "--cache-dir", t.TempDir(), + ) err := root.ExecuteContext(ctx) require.Error(t, err) }) @@ -145,8 +172,13 @@ func TestServer(t *testing.T) { t.Parallel() ctx, cancelFunc := context.WithCancel(context.Background()) defer cancelFunc() - root, _ := clitest.New(t, "server", "--in-memory", "--address", ":0", - "--tls-enable") + root, _ := clitest.New(t, + "server", + "--in-memory", + "--address", ":0", + "--tls-enable", + "--cache-dir", t.TempDir(), + ) err := root.ExecuteContext(ctx) require.Error(t, err) }) @@ -156,8 +188,15 @@ func TestServer(t *testing.T) { defer cancelFunc() certPath, keyPath := generateTLSCertificate(t) - root, cfg := clitest.New(t, "server", "--in-memory", "--address", ":0", - "--tls-enable", "--tls-cert-file", certPath, "--tls-key-file", keyPath) + root, cfg := clitest.New(t, + "server", + "--in-memory", + "--address", ":0", + "--tls-enable", + "--tls-cert-file", certPath, + "--tls-key-file", keyPath, + "--cache-dir", t.TempDir(), + ) errC := make(chan error) go func() { errC <- root.ExecuteContext(ctx) @@ -197,7 +236,13 @@ func TestServer(t *testing.T) { } ctx, cancelFunc := context.WithCancel(context.Background()) defer cancelFunc() - root, cfg := clitest.New(t, "server", "--in-memory", "--address", ":0", "--provisioner-daemons", "1") + root, cfg := clitest.New(t, + "server", + "--in-memory", + "--address", ":0", + "--provisioner-daemons", "1", + "--cache-dir", t.TempDir(), + ) serverErr := make(chan error) go func() { serverErr <- root.ExecuteContext(ctx) @@ -220,7 +265,13 @@ func TestServer(t *testing.T) { t.Parallel() ctx, cancelFunc := context.WithCancel(context.Background()) defer cancelFunc() - root, _ := clitest.New(t, "server", "--in-memory", "--address", ":0", "--trace=true") + root, _ := clitest.New(t, + "server", + "--in-memory", + "--address", ":0", + "--trace=true", + "--cache-dir", t.TempDir(), + ) errC := make(chan error) go func() { errC <- root.ExecuteContext(ctx) @@ -251,7 +302,14 @@ func TestServer(t *testing.T) { server := httptest.NewServer(r) t.Cleanup(server.Close) - root, _ := clitest.New(t, "server", "--in-memory", "--address", ":0", "--telemetry", "--telemetry-url", server.URL) + root, _ := clitest.New(t, + "server", + "--in-memory", + "--address", ":0", + "--telemetry", + "--telemetry-url", server.URL, + "--cache-dir", t.TempDir(), + ) errC := make(chan error) go func() { errC <- root.ExecuteContext(ctx)