mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-10 21:53:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

runc list: fix error reporting for non-existent root

Browse Source 
The idea of commit d1fca8e was right (report errors for non-existent
root, unless using the default root dir) but the logic was inverted.

Fix the logic.

Test case for default root requires non-existent /root/runc, which is
not always possible.

Reported-by: RedMakeUp <girafeeblue@gmail.com>
Co-authored-by: RedMakeUp <girafeeblue@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2026-05-22 14:35:52 -07:00
parent d0aeb9e3e2
commit 98c442a0e6
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
list.go
+1 -1
View File
@@ -119,7 +119,7 @@ func getContainers(cmd *cli.Command) ([]containerState, error) {
root := cmd.String("root") root := cmd.String("root")
list, err := os.ReadDir(root) list, err := os.ReadDir(root)
if err != nil { if err != nil {
if errors.Is(err, os.ErrNotExist) && cmd.IsSet("root") { if errors.Is(err, os.ErrNotExist) && !cmd.IsSet("root") {
// Ignore non-existing default root directory // Ignore non-existing default root directory
// (no containers created yet). // (no containers created yet).
return nil, nil return nil, nil
tests/integration/list.bats
+12
View File
@@ -51,3 +51,15 @@ function teardown() {
[[ "${lines[0]}" == *[,][\{]"\"ociVersion\""[:]"\""*[0-9][\.]*[0-9][\.]*[0-9]*"\""[,]"\"id\""[:]"\"test_box2\""[,]"\"pid\""[:]*[0-9][,]"\"status\""[:]*"\"running\""[,]"\"bundle\""[:]*$bundle*[,]"\"rootfs\""[:]"\""*"\""[,]"\"created\""[:]*[0-9]*[\}]* ]] [[ "${lines[0]}" == *[,][\{]"\"ociVersion\""[:]"\""*[0-9][\.]*[0-9][\.]*[0-9]*"\""[,]"\"id\""[:]"\"test_box2\""[,]"\"pid\""[:]*[0-9][,]"\"status\""[:]*"\"running\""[,]"\"bundle\""[:]*$bundle*[,]"\"rootfs\""[:]"\""*"\""[,]"\"created\""[:]*[0-9]*[\}]* ]]
[[ "${lines[0]}" == *[,][\{]"\"ociVersion\""[:]"\""*[0-9][\.]*[0-9][\.]*[0-9]*"\""[,]"\"id\""[:]"\"test_box3\""[,]"\"pid\""[:]*[0-9][,]"\"status\""[:]*"\"running\""[,]"\"bundle\""[:]*$bundle*[,]"\"rootfs\""[:]"\""*"\""[,]"\"created\""[:]*[0-9]*[\}][\]] ]] [[ "${lines[0]}" == *[,][\{]"\"ociVersion\""[:]"\""*[0-9][\.]*[0-9][\.]*[0-9]*"\""[,]"\"id\""[:]"\"test_box3\""[,]"\"pid\""[:]*[0-9][,]"\"status\""[:]*"\"running\""[,]"\"bundle\""[:]*$bundle*[,]"\"rootfs\""[:]"\""*"\""[,]"\"created\""[:]*[0-9]*[\}][\]] ]]
} }
@test "list with non-existent root fails" {
ROOT=/non-existent-dir runc list
[ "$status" -ne 0 ]
}
@test "list with default non-existent root succeeds" {
requires root # rootless auto-creates a directory under $XDG_RUNTIME_DIR.
test -d /root/runc && skip "requires missing /root/runc"
ROOT='' runc list
[ "$status" -eq 0 ]
}