From 52b44b98161872f704f7e3eea16e0f3177ca4e42 Mon Sep 17 00:00:00 2001
From: Yong Tang <yong.tang.github@outlook.com>
Date: Fri, 5 Jan 2018 01:50:58 +0000
Subject: [PATCH] Add test case for `before` and `since` filter for `docker ps`

This fix adds an integration test for `before` and `since` filter for `docker ps`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
---
 integration/container/ps_test.go | 64 ++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 integration/container/ps_test.go

diff --git a/integration/container/ps_test.go b/integration/container/ps_test.go
new file mode 100644
index 0000000000..b7eaa72f44
--- /dev/null
+++ b/integration/container/ps_test.go
@@ -0,0 +1,64 @@
+package container
+
+import (
+	"context"
+	"testing"
+
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/api/types/network"
+	"github.com/docker/docker/integration/util/request"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPsFilter(t *testing.T) {
+	defer setupTest(t)()
+	client := request.NewAPIClient(t)
+	ctx := context.Background()
+
+	createContainerForFilter := func(ctx context.Context, name string) string {
+		body, err := client.ContainerCreate(ctx,
+			&container.Config{
+				Cmd:   []string{"top"},
+				Image: "busybox",
+			},
+			&container.HostConfig{},
+			&network.NetworkingConfig{},
+			name,
+		)
+		require.NoError(t, err)
+		return body.ID
+	}
+
+	prev := createContainerForFilter(ctx, "prev")
+	createContainerForFilter(ctx, "top")
+	next := createContainerForFilter(ctx, "next")
+
+	containerIDs := func(containers []types.Container) []string {
+		entries := []string{}
+		for _, container := range containers {
+			entries = append(entries, container.ID)
+		}
+		return entries
+	}
+
+	f1 := filters.NewArgs()
+	f1.Add("since", "top")
+	q1, err := client.ContainerList(ctx, types.ContainerListOptions{
+		All:     true,
+		Filters: f1,
+	})
+	require.NoError(t, err)
+	assert.Contains(t, containerIDs(q1), next)
+
+	f2 := filters.NewArgs()
+	f2.Add("before", "top")
+	q2, err := client.ContainerList(ctx, types.ContainerListOptions{
+		All:     true,
+		Filters: f2,
+	})
+	require.NoError(t, err)
+	assert.Contains(t, containerIDs(q2), prev)
+}