From 21e96eaaa72f6798dadb1f6f5829151c9f6dd8f8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 15 May 2025 12:49:56 +0200 Subject: [PATCH] cli/command/completion: use ContainerState consts in tests Signed-off-by: Sebastiaan van Stijn --- cli/command/completion/functions_test.go | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/cli/command/completion/functions_test.go b/cli/command/completion/functions_test.go index 077a2f0662..12cd0ce425 100644 --- a/cli/command/completion/functions_test.go +++ b/cli/command/completion/functions_test.go @@ -82,9 +82,9 @@ func TestCompleteContainerNames(t *testing.T) { doc: "all containers", showAll: true, containers: []container.Summary{ - {ID: "id-c", State: "running", Names: []string{"/container-c", "/container-c/link-b"}}, - {ID: "id-b", State: "created", Names: []string{"/container-b"}}, - {ID: "id-a", State: "exited", Names: []string{"/container-a"}}, + {ID: "id-c", State: container.StateRunning, Names: []string{"/container-c", "/container-c/link-b"}}, + {ID: "id-b", State: container.StateCreated, Names: []string{"/container-b"}}, + {ID: "id-a", State: container.StateExited, Names: []string{"/container-a"}}, }, expOut: []string{"container-c", "container-c/link-b", "container-b", "container-a"}, expOpts: container.ListOptions{All: true}, @@ -95,9 +95,9 @@ func TestCompleteContainerNames(t *testing.T) { showAll: true, showIDs: true, containers: []container.Summary{ - {ID: "id-c", State: "running", Names: []string{"/container-c", "/container-c/link-b"}}, - {ID: "id-b", State: "created", Names: []string{"/container-b"}}, - {ID: "id-a", State: "exited", Names: []string{"/container-a"}}, + {ID: "id-c", State: container.StateRunning, Names: []string{"/container-c", "/container-c/link-b"}}, + {ID: "id-b", State: container.StateCreated, Names: []string{"/container-b"}}, + {ID: "id-a", State: container.StateExited, Names: []string{"/container-a"}}, }, expOut: []string{"id-c", "container-c", "container-c/link-b", "id-b", "container-b", "id-a", "container-a"}, expOpts: container.ListOptions{All: true}, @@ -107,7 +107,7 @@ func TestCompleteContainerNames(t *testing.T) { doc: "only running containers", showAll: false, containers: []container.Summary{ - {ID: "id-c", State: "running", Names: []string{"/container-c", "/container-c/link-b"}}, + {ID: "id-c", State: container.StateRunning, Names: []string{"/container-c", "/container-c/link-b"}}, }, expOut: []string{"container-c", "container-c/link-b"}, expDirective: cobra.ShellCompDirectiveNoFileComp, @@ -116,12 +116,12 @@ func TestCompleteContainerNames(t *testing.T) { doc: "with filter", showAll: true, filters: []func(container.Summary) bool{ - func(container container.Summary) bool { return container.State == "created" }, + func(ctr container.Summary) bool { return ctr.State == container.StateCreated }, }, containers: []container.Summary{ - {ID: "id-c", State: "running", Names: []string{"/container-c", "/container-c/link-b"}}, - {ID: "id-b", State: "created", Names: []string{"/container-b"}}, - {ID: "id-a", State: "exited", Names: []string{"/container-a"}}, + {ID: "id-c", State: container.StateRunning, Names: []string{"/container-c", "/container-c/link-b"}}, + {ID: "id-b", State: container.StateCreated, Names: []string{"/container-b"}}, + {ID: "id-a", State: container.StateExited, Names: []string{"/container-a"}}, }, expOut: []string{"container-b"}, expOpts: container.ListOptions{All: true}, @@ -131,13 +131,13 @@ func TestCompleteContainerNames(t *testing.T) { doc: "multiple filters", showAll: true, filters: []func(container.Summary) bool{ - func(container container.Summary) bool { return container.ID == "id-a" }, - func(container container.Summary) bool { return container.State == "created" }, + func(ctr container.Summary) bool { return ctr.ID == "id-a" }, + func(ctr container.Summary) bool { return ctr.State == container.StateCreated }, }, containers: []container.Summary{ - {ID: "id-c", State: "running", Names: []string{"/container-c", "/container-c/link-b"}}, - {ID: "id-b", State: "created", Names: []string{"/container-b"}}, - {ID: "id-a", State: "created", Names: []string{"/container-a"}}, + {ID: "id-c", State: container.StateRunning, Names: []string{"/container-c", "/container-c/link-b"}}, + {ID: "id-b", State: container.StateCreated, Names: []string{"/container-b"}}, + {ID: "id-a", State: container.StateCreated, Names: []string{"/container-a"}}, }, expOut: []string{"container-a"}, expOpts: container.ListOptions{All: true},