Skip to content

Commit 1c04b20

Browse files
mafredrimafredri
authored
fix: Set cache dir for coderd tests (#3160)
* fix: Set cache dir for coderd in codedtest * fix: Ensure server cli tests have a cache path To avoid sharing default path.
1 parent 6916d34 commit 1c04b20

File tree

3 files changed

+79
-15
lines changed

3 files changed

+79
-15
lines changed

‎cli/resetpassword_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ func TestResetPassword(t *testing.T) {
3838
defer closeFunc()
3939
ctx, cancelFunc := context.WithCancel(context.Background())
4040
serverDone := make(chan struct{})
41-
serverCmd, cfg := clitest.New(t, "server", "--address", ":0", "--postgres-url", connectionURL)
41+
serverCmd, cfg := clitest.New(t,
42+
"server",
43+
"--address", ":0",
44+
"--postgres-url", connectionURL,
45+
"--cache-dir", t.TempDir(),
46+
)
4247
go func() {
4348
defer close(serverDone)
4449
err = serverCmd.ExecuteContext(ctx)

‎cli/server_test.go

Lines changed: 72 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ func TestServer(t *testing.T) {
4545
defer closeFunc()
4646
ctx, cancelFunc := context.WithCancel(context.Background())
4747
defer cancelFunc()
48-
root, cfg := clitest.New(t, "server", "--address", ":0", "--postgres-url", connectionURL)
48+
root, cfg := clitest.New(t,
49+
"server",
50+
"--address", ":0",
51+
"--postgres-url", connectionURL,
52+
"--cache-dir", t.TempDir(),
53+
)
4954
errC := make(chan error)
5055
go func() {
5156
errC <- root.ExecuteContext(ctx)
@@ -75,7 +80,11 @@ func TestServer(t *testing.T) {
7580
t.SkipNow()
7681
}
7782
ctx, cancelFunc := context.WithCancel(context.Background())
78-
root, cfg := clitest.New(t, "server", "--address", ":0")
83+
root, cfg := clitest.New(t,
84+
"server",
85+
"--address", ":0",
86+
"--cache-dir", t.TempDir(),
87+
)
7988
errC := make(chan error)
8089
go func() {
8190
errC <- root.ExecuteContext(ctx)
@@ -102,7 +111,13 @@ func TestServer(t *testing.T) {
102111
ctx, cancelFunc := context.WithCancel(context.Background())
103112
defer cancelFunc()
104113

105-
root, cfg := clitest.New(t, "server", "--in-memory", "--address", ":0", "--access-url", "http://1.2.3.4:3000/")
114+
root, cfg := clitest.New(t,
115+
"server",
116+
"--in-memory",
117+
"--address", ":0",
118+
"--access-url", "http://1.2.3.4:3000/",
119+
"--cache-dir", t.TempDir(),
120+
)
106121
var buf strings.Builder
107122
errC := make(chan error)
108123
root.SetOutput(&buf)
@@ -127,26 +142,43 @@ func TestServer(t *testing.T) {
127142
t.Parallel()
128143
ctx, cancelFunc := context.WithCancel(context.Background())
129144
defer cancelFunc()
130-
root, _ := clitest.New(t, "server", "--in-memory", "--address", ":0",
131-
"--tls-enable", "--tls-min-version", "tls9")
145+
root, _ := clitest.New(t,
146+
"server",
147+
"--in-memory",
148+
"--address", ":0",
149+
"--tls-enable",
150+
"--tls-min-version", "tls9",
151+
"--cache-dir", t.TempDir(),
152+
)
132153
err := root.ExecuteContext(ctx)
133154
require.Error(t, err)
134155
})
135156
t.Run("TLSBadClientAuth", func(t *testing.T) {
136157
t.Parallel()
137158
ctx, cancelFunc := context.WithCancel(context.Background())
138159
defer cancelFunc()
139-
root, _ := clitest.New(t, "server", "--in-memory", "--address", ":0",
140-
"--tls-enable", "--tls-client-auth", "something")
160+
root, _ := clitest.New(t,
161+
"server",
162+
"--in-memory",
163+
"--address", ":0",
164+
"--tls-enable",
165+
"--tls-client-auth", "something",
166+
"--cache-dir", t.TempDir(),
167+
)
141168
err := root.ExecuteContext(ctx)
142169
require.Error(t, err)
143170
})
144171
t.Run("TLSNoCertFile", func(t *testing.T) {
145172
t.Parallel()
146173
ctx, cancelFunc := context.WithCancel(context.Background())
147174
defer cancelFunc()
148-
root, _ := clitest.New(t, "server", "--in-memory", "--address", ":0",
149-
"--tls-enable")
175+
root, _ := clitest.New(t,
176+
"server",
177+
"--in-memory",
178+
"--address", ":0",
179+
"--tls-enable",
180+
"--cache-dir", t.TempDir(),
181+
)
150182
err := root.ExecuteContext(ctx)
151183
require.Error(t, err)
152184
})
@@ -156,8 +188,15 @@ func TestServer(t *testing.T) {
156188
defer cancelFunc()
157189

158190
certPath, keyPath := generateTLSCertificate(t)
159-
root, cfg := clitest.New(t, "server", "--in-memory", "--address", ":0",
160-
"--tls-enable", "--tls-cert-file", certPath, "--tls-key-file", keyPath)
191+
root, cfg := clitest.New(t,
192+
"server",
193+
"--in-memory",
194+
"--address", ":0",
195+
"--tls-enable",
196+
"--tls-cert-file", certPath,
197+
"--tls-key-file", keyPath,
198+
"--cache-dir", t.TempDir(),
199+
)
161200
errC := make(chan error)
162201
go func() {
163202
errC <- root.ExecuteContext(ctx)
@@ -197,7 +236,13 @@ func TestServer(t *testing.T) {
197236
}
198237
ctx, cancelFunc := context.WithCancel(context.Background())
199238
defer cancelFunc()
200-
root, cfg := clitest.New(t, "server", "--in-memory", "--address", ":0", "--provisioner-daemons", "1")
239+
root, cfg := clitest.New(t,
240+
"server",
241+
"--in-memory",
242+
"--address", ":0",
243+
"--provisioner-daemons", "1",
244+
"--cache-dir", t.TempDir(),
245+
)
201246
serverErr := make(chan error)
202247
go func() {
203248
serverErr <- root.ExecuteContext(ctx)
@@ -220,7 +265,13 @@ func TestServer(t *testing.T) {
220265
t.Parallel()
221266
ctx, cancelFunc := context.WithCancel(context.Background())
222267
defer cancelFunc()
223-
root, _ := clitest.New(t, "server", "--in-memory", "--address", ":0", "--trace=true")
268+
root, _ := clitest.New(t,
269+
"server",
270+
"--in-memory",
271+
"--address", ":0",
272+
"--trace=true",
273+
"--cache-dir", t.TempDir(),
274+
)
224275
errC := make(chan error)
225276
go func() {
226277
errC <- root.ExecuteContext(ctx)
@@ -251,7 +302,14 @@ func TestServer(t *testing.T) {
251302
server := httptest.NewServer(r)
252303
defer server.Close()
253304

254-
root, _ := clitest.New(t, "server", "--in-memory", "--address", ":0", "--telemetry", "--telemetry-url", server.URL)
305+
root, _ := clitest.New(t,
306+
"server",
307+
"--in-memory",
308+
"--address", ":0",
309+
"--telemetry",
310+
"--telemetry-url", server.URL,
311+
"--cache-dir", t.TempDir(),
312+
)
255313
errC := make(chan error)
256314
go func() {
257315
errC <- root.ExecuteContext(ctx)

‎coderd/coderdtest/coderdtest.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ func newWithCloser(t *testing.T, options *Options) (*codersdk.Client, io.Closer)
182182
AgentInactiveDisconnectTimeout: 5 * time.Second,
183183
AccessURL: serverURL,
184184
Logger: slogtest.Make(t, nil).Leveled(slog.LevelDebug),
185+
CacheDir: t.TempDir(),
185186
Database: db,
186187
Pubsub: pubsub,
187188

0 commit comments

Comments
 (0)