Skip to content

Updated Integration Testing on Windows #6394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tonistiigi merged 2 commits into from
Dec 15, 2025
+73 −16
Merged

Updated Integration Testing on Windows #6394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e901ddb
Resolved unnecessary files
ngebremariam-msft Dec 3, 2025
fdd0035
Resolved Lint Errors
ngebremariam-msft Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 70 additions & 13 deletions client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7815,21 +7815,30 @@ func testWhiteoutParentDir(t *testing.T, sb integration.Sandbox) {

// #2490
func testMoveParentDir(t *testing.T, sb integration.Sandbox) {
integration.SkipOnPlatform(t, "windows")
workers.CheckFeatureCompat(t, sb, workers.FeatureOCIExporter)
c, err := New(sb.Context(), sb.Address())
require.NoError(t, err)
defer c.Close()

busybox := llb.Image("busybox:latest")
imgName := integration.UnixOrWindows("busybox:latest", "nanoserver:latest")
busybox := llb.Image(imgName)
st := llb.Scratch()

run := func(cmd string) {
st = busybox.Run(llb.Shlex(cmd), llb.Dir("/wd")).AddMount("/wd", st)
}
switch imgName {
case "nanoserver:latest":
run := func(cmd string) {
st = busybox.Run(llb.Shlex(cmd), llb.Dir("/wd")).Root()
}

run(`sh -c "mkdir -p foo; echo -n first > foo/bar;"`)
run(`mv foo foo2`)
run(`cmd /c "mkdir foo && echo first > foo/bar && move foo foo2"`)
case "busybox:latest":
run := func(cmd string) {
st = busybox.Run(llb.Shlex(cmd), llb.Dir("/wd")).AddMount("/wd", st)
}

run(`sh -c "mkdir -p foo; echo -n first > foo/bar;"`)
run(`mv foo foo2`)
}

def, err := st.Marshal(sb.Context())
require.NoError(t, err)
Expand Down Expand Up @@ -7871,14 +7880,62 @@ func testMoveParentDir(t *testing.T, sb integration.Sandbox) {
m, err = testutil.ReadTarToMap(layer.Data, true)
require.NoError(t, err)

_, ok = m[".wh.foo"]
require.True(t, ok)
switch imgName {
case "nanoserver:latest":
_, ok = m["/wd/foo/bar"] // Should be false, else move didn't happen
require.False(t, ok)

_, ok = m["foo2/"]
require.True(t, ok)
_, ok = m["Files/wd/foo/bar"] // Should be false, else move didn't happen
require.False(t, ok)

_, ok = m["foo2/bar"]
require.True(t, ok)
_, ok = m["Files/wd/foo2/bar"]
require.True(t, ok)

_, ok = m["Files/wd/foo2"]
require.True(t, ok)

_, ok = m["Files/wd"]
require.True(t, ok)

for key := range m {
if err == nil && strings.Contains(key, "/wd") {
ok = true
break
} else {
ok = false
}
}
require.True(t, ok)

for key := range m {
if err == nil && strings.Contains(key, "/foo2/bar") {
ok = true
break
} else {
ok = false
}
}
require.True(t, ok)

for key := range m {
if err == nil && strings.Contains(key, "/foo2") {
ok = true
break
} else {
ok = false
}
}
require.True(t, ok)
case "busybox:latest":
_, ok = m[".wh.foo"]
require.True(t, ok)

_, ok = m["foo2/"]
require.True(t, ok)

_, ok = m["foo2/bar"]
require.True(t, ok)
}
}

// #319
Expand Down
6 changes: 3 additions & 3 deletions frontend/dockerfile/dockerfile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ RUN cmd /V:on /C "set /p tfcontent=<\sample\testfile \
}

func testCopyLinkDotDestDir(t *testing.T, sb integration.Sandbox) {
integration.SkipOnPlatform(t, "windows", "COPY --link requires diffApply which is not supported on Windows")
integration.SkipOnPlatform(t, "windows", "COPY --link requires diffApply which is not supported on Windows. Set COPY --link=false for default COPY behavior")
f := getFrontend(t, sb)

dockerfile := []byte(`
Expand Down Expand Up @@ -650,7 +650,7 @@ RUN [ "$(cat testfile)" == "contents0" ]
}

func testCopyLinkEmptyDestDir(t *testing.T, sb integration.Sandbox) {
integration.SkipOnPlatform(t, "windows", "COPY --link requires diffApply which is not supported on Windows")
integration.SkipOnPlatform(t, "windows", "COPY --link requires diffApply which is not supported on Windows. Set COPY --link=false for default COPY behavior")
f := getFrontend(t, sb)

dockerfile := []byte(`
Expand Down Expand Up @@ -824,7 +824,7 @@ COPY foo foo
}

func testTarExporterMulti(t *testing.T, sb integration.Sandbox) {
integration.SkipOnPlatform(t, "windows", "Multi-platform tar export test specifically targets linux/amd64 and darwin/amd64 platforms")
integration.SkipOnPlatform(t, "windows", "Multi-platform tar export test specifically targets linux/amd64 and darwin/amd64 platforms as feature it's supported on Windows")
f := getFrontend(t, sb)

dockerfile := []byte(`
Expand Down