Browse code
integration-cli: inline filters in tests
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2023/04/25 22:14:27Showing 3 changed files
- integration-cli/daemon/daemon_swarm.go
- integration-cli/docker_api_images_test.go
- integration-cli/docker_api_network_test.go
| ... | ... |
@@ -102,14 +102,9 @@ func (d *Daemon) CheckRunningTaskNetworks(c *testing.T) (interface{}, string) {
|
| 102 | 102 |
cli := d.NewClientT(c) |
| 103 | 103 |
defer cli.Close() |
| 104 | 104 |
|
| 105 |
- filterArgs := filters.NewArgs() |
|
| 106 |
- filterArgs.Add("desired-state", "running")
|
|
| 107 |
- |
|
| 108 |
- options := types.TaskListOptions{
|
|
| 109 |
- Filters: filterArgs, |
|
| 110 |
- } |
|
| 111 |
- |
|
| 112 |
- tasks, err := cli.TaskList(context.Background(), options) |
|
| 105 |
+ tasks, err := cli.TaskList(context.Background(), types.TaskListOptions{
|
|
| 106 |
+ Filters: filters.NewArgs(filters.Arg("desired-state", "running")),
|
|
| 107 |
+ }) |
|
| 113 | 108 |
assert.NilError(c, err) |
| 114 | 109 |
|
| 115 | 110 |
result := make(map[string]int) |
| ... | ... |
@@ -126,14 +121,9 @@ func (d *Daemon) CheckRunningTaskImages(c *testing.T) (interface{}, string) {
|
| 126 | 126 |
cli := d.NewClientT(c) |
| 127 | 127 |
defer cli.Close() |
| 128 | 128 |
|
| 129 |
- filterArgs := filters.NewArgs() |
|
| 130 |
- filterArgs.Add("desired-state", "running")
|
|
| 131 |
- |
|
| 132 |
- options := types.TaskListOptions{
|
|
| 133 |
- Filters: filterArgs, |
|
| 134 |
- } |
|
| 135 |
- |
|
| 136 |
- tasks, err := cli.TaskList(context.Background(), options) |
|
| 129 |
+ tasks, err := cli.TaskList(context.Background(), types.TaskListOptions{
|
|
| 130 |
+ Filters: filters.NewArgs(filters.Arg("desired-state", "running")),
|
|
| 131 |
+ }) |
|
| 137 | 132 |
assert.NilError(c, err) |
| 138 | 133 |
|
| 139 | 134 |
result := make(map[string]int) |
| ... | ... |
@@ -28,11 +28,9 @@ func (s *DockerAPISuite) TestAPIImagesFilter(c *testing.T) {
|
| 28 | 28 |
dockerCmd(c, "tag", "busybox", n) |
| 29 | 29 |
} |
| 30 | 30 |
getImages := func(filter string) []types.ImageSummary {
|
| 31 |
- fltrs := filters.NewArgs() |
|
| 32 |
- fltrs.Add("reference", filter)
|
|
| 33 | 31 |
options := types.ImageListOptions{
|
| 34 | 32 |
All: false, |
| 35 |
- Filters: fltrs, |
|
| 33 |
+ Filters: filters.NewArgs(filters.Arg("reference", filter)),
|
|
| 36 | 34 |
} |
| 37 | 35 |
images, err := apiClient.ImageList(context.Background(), options) |
| 38 | 36 |
assert.NilError(c, err) |
| ... | ... |
@@ -286,13 +286,9 @@ func isNetworkAvailable(c *testing.T, name string) bool {
|
| 286 | 286 |
} |
| 287 | 287 |
|
| 288 | 288 |
func getNetworkIDByName(c *testing.T, name string) string {
|
| 289 |
- var ( |
|
| 290 |
- v = url.Values{}
|
|
| 291 |
- filterArgs = filters.NewArgs() |
|
| 292 |
- ) |
|
| 293 |
- filterArgs.Add("name", name)
|
|
| 294 |
- filterJSON, err := filters.ToJSON(filterArgs) |
|
| 289 |
+ filterJSON, err := filters.ToJSON(filters.NewArgs(filters.Arg("name", name)))
|
|
| 295 | 290 |
assert.NilError(c, err) |
| 291 |
+ v := url.Values{}
|
|
| 296 | 292 |
v.Set("filters", filterJSON)
|
| 297 | 293 |
|
| 298 | 294 |
resp, body, err := request.Get("/networks?" + v.Encode())
|