mirror of
https://github.com/89luca89/distrobox.git
synced 2026-08-19 01:14:49 -05:00
Luca Di Maio
38da4b5e89
IsDistrobox matched any label key OR value containing "distrobox", so
unrelated containers carrying a path or project tag that happened to
include the substring (e.g. a workdir under a "distrobox" directory)
leaked into `distrobox list` — and into the rm/upgrade/stop pipelines
that filter through the same call.
Label values are never authoritative; only `manager=distrobox` and the
`distrobox.*` key namespace are ever set by us. Check those directly,
keeping 24b31ed8 working for manager-overridden boxes (apx).
Signed-off-by: Luca Di Maio <luca.dimaio1@gmail.com>
74 lines
2.2 KiB
Go
74 lines
2.2 KiB
Go
package commands_test
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/89luca89/distrobox/pkg/commands"
|
|
"github.com/89luca89/distrobox/pkg/config"
|
|
"github.com/89luca89/distrobox/pkg/containermanager"
|
|
"github.com/89luca89/distrobox/pkg/internal/testutil"
|
|
)
|
|
|
|
// ListCommand must drop containers that are not distrobox-owned, even when a
|
|
// foreign tool's label value happens to contain the substring "distrobox"
|
|
// (the regression that motivated tightening Container.IsDistrobox).
|
|
func TestListCommand_FiltersNonDistroboxContainers(t *testing.T) {
|
|
mock := &testutil.MockContainerManager{
|
|
ListContainersResult: []containermanager.Container{
|
|
{
|
|
Name: "real-box",
|
|
Image: "registry.fedoraproject.org/fedora-toolbox:latest",
|
|
Status: "Up",
|
|
Labels: map[string]string{"manager": "distrobox", "distrobox.unshare_groups": "0"},
|
|
},
|
|
{
|
|
Name: "apx-box",
|
|
Image: "docker.io/library/ubuntu:22.04",
|
|
Status: "Exited",
|
|
Labels: map[string]string{"manager": "apx", "distrobox.unshare_groups": "0"},
|
|
},
|
|
{
|
|
Name: "plain-box",
|
|
Image: "docker.io/library/alpine:latest",
|
|
Status: "Up",
|
|
Labels: map[string]string{"foo": "bar"},
|
|
},
|
|
{
|
|
Name: "dir-box",
|
|
Image: "docker.io/library/alpine:latest",
|
|
Status: "Up",
|
|
Labels: map[string]string{
|
|
"example.dir": "/home/luca/distrobox",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
cmd := commands.NewListCommand(&config.Values{}, mock)
|
|
result, err := cmd.Execute(context.Background())
|
|
require.NoError(t, err)
|
|
|
|
names := make([]string, 0, len(result.Containers))
|
|
for _, c := range result.Containers {
|
|
names = append(names, c.Name)
|
|
}
|
|
assert.Equal(t, []string{"apx-box", "real-box"}, names,
|
|
"plain-box (no distrobox labels) and dir-box (distrobox only inside a label value) must be filtered out; result must be sorted by name")
|
|
}
|
|
|
|
// Empty container list propagates through the filter without surprise.
|
|
func TestListCommand_EmptyResult(t *testing.T) {
|
|
mock := &testutil.MockContainerManager{
|
|
ListContainersResult: []containermanager.Container{},
|
|
}
|
|
|
|
cmd := commands.NewListCommand(&config.Values{}, mock)
|
|
result, err := cmd.Execute(context.Background())
|
|
require.NoError(t, err)
|
|
assert.Empty(t, result.Containers)
|
|
}
|