dilim/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-06-24 08:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5297 from kolyshkin/fix-5203

Browse Source 
runc list: fix error reporting for non-existent root
This commit is contained in:
Rodrigo Campos Catelin
2026-05-26 17:18:47 +02:00
committed by GitHub
parent d0aeb9e3e2 98c442a0e6
commit a271890df2
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
list.go
View File

@@ -119,7 +119,7 @@ func getContainers(cmd *cli.Command) ([]containerState, error) {
root := cmd.String("root")
list, err := os.ReadDir(root)
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
// (no containers created yet).
return nil, nil

12
tests/integration/list.bats
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_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 ]
}