Skip to content

[pull] main from containerd:main #415

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
pull merged 2 commits into from
Jul 17, 2026
+3 −3
Merged

[pull] main from containerd:main #415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
807fbc1
core/mount/manager: improve TestMkdirHandler failure messages
SaloniRathi Jul 16, 2026
cb23630
Merge pull request #13800 from SaloniRathi/fix-test-error-messages
mikebrow Jul 17, 2026
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
6 changes: 3 additions & 3 deletions core/mount/manager/mkdir_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@ func TestMkdirHandler(t *testing.T) {
t.Fatalf("expected directory")
}
if fi.Mode().Perm() != testmode {
t.Fatalf("expected mode 0775 got %o", fi.Mode().Perm())
t.Fatalf("expected mode %04o got %04o", testmode, fi.Mode().Perm())
}
sys := fi.Sys().(*syscall.Stat_t)
if int(sys.Uid) != luid {
t.Fatalf("expected uid 1000 got %d", sys.Uid)
t.Fatalf("expected uid %d got %d", luid, sys.Uid)
}
if int(sys.Gid) != lgid {
t.Fatalf("expected gid 1000 got %d", sys.Gid)
t.Fatalf("expected gid %d got %d", lgid, sys.Gid)
}

m.Options = append(m.Options, fmt.Sprintf("X-containerd.mkdir.path=%s", filepath.Join(td, "notinroot")))
Expand Down
Loading