InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: inline filters in tests

Browse Source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2023-04-25 15:11:32 +02:00
parent a343ed13e5
commit 081b5e3d4e
15 changed files with 113 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
client/container_prune_test.go
View File

@@ -23,9 +23,7 @@ func TestContainersPruneError(t *testing.T) {
version: "1.25",
}
filters := filters.NewArgs()
_, err := client.ContainersPrune(context.Background(), filters)
_, err := client.ContainersPrune(context.Background(), filters.Args{})
if !errdefs.IsSystem(err) {
t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
}
@@ -34,21 +32,6 @@ func TestContainersPruneError(t *testing.T) {
func TestContainersPrune(t *testing.T) {
expectedURL := "/v1.25/containers/prune"
danglingFilters := filters.NewArgs()
danglingFilters.Add("dangling", "true")
noDanglingFilters := filters.NewArgs()
noDanglingFilters.Add("dangling", "false")
danglingUntilFilters := filters.NewArgs()
danglingUntilFilters.Add("dangling", "true")
danglingUntilFilters.Add("until", "2016-12-15T14:00")
labelFilters := filters.NewArgs()
labelFilters.Add("dangling", "true")
labelFilters.Add("label", "label1=foo")
labelFilters.Add("label", "label2!=bar")
listCases := []struct {
filters filters.Args
expectedQueryParams map[string]string
@@ -62,7 +45,7 @@ func TestContainersPrune(t *testing.T) {
},
},
{
filters: danglingFilters,
filters: filters.NewArgs(filters.Arg("dangling", "true")),
expectedQueryParams: map[string]string{
"until": "",
"filter": "",
@@ -70,7 +53,10 @@ func TestContainersPrune(t *testing.T) {
},
},
{
filters: danglingUntilFilters,
filters: filters.NewArgs(
filters.Arg("dangling", "true"),
filters.Arg("until", "2016-12-15T14:00"),
),
expectedQueryParams: map[string]string{
"until": "",
"filter": "",
@@ -78,7 +64,7 @@ func TestContainersPrune(t *testing.T) {
},
},
{
filters: noDanglingFilters,
filters: filters.NewArgs(filters.Arg("dangling", "false")),
expectedQueryParams: map[string]string{
"until": "",
"filter": "",
@@ -86,7 +72,11 @@ func TestContainersPrune(t *testing.T) {
},
},
{
filters: labelFilters,
filters: filters.NewArgs(
filters.Arg("dangling", "true"),
filters.Arg("label", "label1=foo"),
filters.Arg("label", "label2!=bar"),
),
expectedQueryParams: map[string]string{
"until": "",
"filter": "",