Merge pull request #4196 from Shubhranshu153/fix-nerdctl-ps-filter

fix: nerdctl ps filter --status=created

Author: AkihiroSuda

cmd/nerdctl/container/container_create_test.go

@@ -18,6 +18,7 @@ package container
 
 import (
 	"encoding/json"
+	"fmt"
 	"testing"
 	"time"
 
@@ -41,29 +42,20 @@ func TestCreate(t *testing.T) {
 		helpers.Anyhow("rm", "-f", data.Identifier("container"))
 	}
 
-	testCase.Require = nerdtest.IsFlaky("https://github.com/containerd/nerdctl/issues/3717")
-
 	testCase.SubTests = []*test.Case{
 		{
 			Description: "ps -a",
 			NoParallel:  true,
-			Command:     test.Command("ps", "-a"),
-			// FIXME: this might get a false positive if other tests have created a container
-			Expected: test.Expects(0, nil, expect.Contains("Created")),
-		},
-		{
-			Description: "start",
-			NoParallel:  true,
 			Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
-				return helpers.Command("start", data.Labels().Get("cID"))
+				return helpers.Command("ps", "-a", "--filter", "status=created", "--filter", fmt.Sprintf("name=%s", data.Labels().Get("cID")))
 			},
-			Expected: test.Expects(0, nil, nil),
+			Expected: test.Expects(0, nil, expect.Contains("Created")),
 		},
 		{
-			Description: "logs",
+			Description: "start",
 			NoParallel:  true,
 			Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
-				return helpers.Command("logs", data.Labels().Get("cID"))
+				return helpers.Command("start", "-a", data.Labels().Get("cID"))
 			},
 			Expected: test.Expects(0, nil, expect.Contains("foo")),
 		},

cmd/nerdctl/container/container_list_linux_test.go

@@ -26,6 +26,8 @@ import (
 
 	"gotest.tools/v3/assert"
 
+	"github.com/containerd/nerdctl/mod/tigron/test"
+
 	"github.com/containerd/nerdctl/v2/pkg/formatter"
 	"github.com/containerd/nerdctl/v2/pkg/strutil"
 	"github.com/containerd/nerdctl/v2/pkg/tabutil"
@@ -628,3 +630,35 @@ func TestContainerListCheckCreatedTime(t *testing.T) {
 		t.Errorf("expected containers in decending order")
 	}
 }
+
+func TestContainerListStatusFilter(t *testing.T) {
+	testCase := nerdtest.Setup()
+	testCase.Setup = func(data test.Data, helpers test.Helpers) {
+		helpers.Ensure("create", "--name", data.Identifier("container"), testutil.CommonImage, "echo", "foo")
+		data.Labels().Set("cID", data.Identifier("container"))
+	}
+	testCase.Cleanup = func(data test.Data, helpers test.Helpers) {
+		helpers.Anyhow("rm", "-f", data.Identifier("container"))
+	}
+
+	testCase.SubTests = []*test.Case{
+		// TODO: Refactor other filter tests
+		{
+			Description: "ps filter with status=created",
+			NoParallel:  true,
+			Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
+				return helpers.Command("ps", "-a", "--filter", "status=created", "--filter", fmt.Sprintf("name=%s", data.Labels().Get("cID")))
+			},
+			Expected: func(data test.Data, helpers test.Helpers) *test.Expected {
+				return &test.Expected{
+					ExitCode: 0,
+					Output: func(stdout, info string, t *testing.T) {
+						assert.Assert(t, strings.Contains(stdout, data.Labels().Get("cID")), "No container found with status created")
+					},
+				}
+			},
+		},
+	}
+
+	testCase.Run(t)
+}

cmd/nerdctl/system/system_events_linux_test.go

@@ -29,6 +29,7 @@ import (
 )
 
 func testEventFilterExecutor(data test.Data, helpers test.Helpers) test.TestableCommand {
+	helpers.Ensure("pull", testutil.CommonImage)
 	cmd := helpers.Command("events", "--filter", data.Labels().Get("filter"), "--format", "json")
 	// 3 seconds is too short on slow rig (EL8)
 	cmd.WithTimeout(10 * time.Second)

pkg/cmd/container/list_util.go

@@ -25,6 +25,7 @@ import (
 
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/core/containers"
+	"github.com/containerd/errdefs"
 	"github.com/containerd/log"
 
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"
@@ -106,6 +107,7 @@ func (cl *containerFilterContext) foldExitedFilter(_ context.Context, filter, va
 	if err != nil {
 		return err
 	}
+	log.L.Infof("checking exit status %v %v", filter, value)
 	cl.exitedFilterFuncs = append(cl.exitedFilterFuncs, func(exitStatus int) bool {
 		return exited == exitStatus
 	})
@@ -235,6 +237,10 @@ func (cl *containerFilterContext) matchesTaskFilters(ctx context.Context, contai
 	defer cancel()
 	task, err := container.Task(ctx, nil)
 	if err != nil {
+		if errdefs.IsNotFound(err) {
+			// Check if we want to filter created containers
+			return cl.matchesExitedFilter(containerd.Status{Status: containerd.Created}) && cl.matchesStatusFilter(containerd.Status{Status: containerd.Created})
+		}
 		log.G(ctx).Warn(err)
 		return false
 	}