Skip to content

Commit 3d03c86

Browse files
authored
Update devcontainer_test.go
1 parent 1fa47ec commit 3d03c86

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

devcontainer/devcontainer_test.go

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -222,17 +222,7 @@ func TestImageFromDockerfile(t *testing.T) {
222222
}
223223

224224
func TestImageFromDockerfileWithArgs(t *testing.T) {
225-
t.Parallel()
226-
dc := &devcontainer.Spec{
227-
Build: devcontainer.BuildSpec{
228-
Dockerfile: "Dockerfile",
229-
Context: ".",
230-
Args: map[string]string{
231-
"VARIANT": "3.11-bookworm",
232-
},
233-
},
234-
}
235-
225+
t.Parallel()
236226
for _, tc := range []struct {
237227
content string
238228
image string
@@ -246,7 +236,15 @@ func TestImageFromDockerfileWithArgs(t *testing.T) {
246236
tc := tc
247237
t.Run(tc.image, func(t *testing.T) {
248238
t.Parallel()
249-
239+
dc := &devcontainer.Spec{
240+
Build: devcontainer.BuildSpec{
241+
Dockerfile: "Dockerfile",
242+
Context: ".",
243+
Args: map[string]string{
244+
"VARIANT": "3.11-bookworm",
245+
},
246+
},
247+
}
250248
fs := memfs.New()
251249
dcDir := "/workspaces/coder/.devcontainer"
252250
err := fs.MkdirAll(dcDir, 0o755)
@@ -257,10 +255,8 @@ func TestImageFromDockerfileWithArgs(t *testing.T) {
257255
require.NoError(t, err)
258256
_ = file.Close()
259257
params, err := dc.Compile(fs, dcDir, workingDir, "", "/var/workspace", false, stubLookupEnv)
260-
261258
require.Equal(t, "VARIANT=3.11-bookworm", params.BuildArgs[0])
262259
require.Equal(t, params.DockerfileContent, tc.content)
263-
264260
ref, err := devcontainer.ImageFromDockerfile(tc.content)
265261
require.NoError(t, err)
266262
require.Equal(t, tc.image, ref.Name())

0 commit comments

Comments
 (0)