58738cdee3
This fix is a follow up for comment https://github.com/docker/docker/pull/28535#issuecomment-263215225 This fix provides `--filter until=<timestamp>` for `docker container/image prune`. This fix adds `--filter until=<timestamp>` to `docker container/image prune` so that it is possible to specify a timestamp and prune those containers/images that are earlier than the timestamp. Related docs has been updated Several integration tests have been added to cover changes. This fix fixes #28497. This fix is related to #28535. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
99 lines
2.4 KiB
Go
99 lines
2.4 KiB
Go
package client
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/docker/docker/api/types/filters"
|
|
"github.com/docker/docker/pkg/testutil/assert"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
func TestNetworksPruneError(t *testing.T) {
|
|
client := &Client{
|
|
client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
|
|
version: "1.25",
|
|
}
|
|
|
|
filters := filters.NewArgs()
|
|
|
|
_, err := client.NetworksPrune(context.Background(), filters)
|
|
if err == nil || err.Error() != "Error response from daemon: Server error" {
|
|
t.Fatalf("expected a Server Error, got %v", err)
|
|
}
|
|
}
|
|
|
|
func TestNetworksPrune(t *testing.T) {
|
|
expectedURL := "/v1.25/networks/prune"
|
|
|
|
danglingFilters := filters.NewArgs()
|
|
danglingFilters.Add("dangling", "true")
|
|
|
|
noDanglingFilters := filters.NewArgs()
|
|
noDanglingFilters.Add("dangling", "false")
|
|
|
|
listCases := []struct {
|
|
filters filters.Args
|
|
expectedQueryParams map[string]string
|
|
}{
|
|
{
|
|
filters: filters.Args{},
|
|
expectedQueryParams: map[string]string{
|
|
"until": "",
|
|
"filter": "",
|
|
"filters": "",
|
|
},
|
|
},
|
|
{
|
|
filters: danglingFilters,
|
|
expectedQueryParams: map[string]string{
|
|
"until": "",
|
|
"filter": "",
|
|
"filters": `{"dangling":{"true":true}}`,
|
|
},
|
|
},
|
|
{
|
|
filters: noDanglingFilters,
|
|
expectedQueryParams: map[string]string{
|
|
"until": "",
|
|
"filter": "",
|
|
"filters": `{"dangling":{"false":true}}`,
|
|
},
|
|
},
|
|
}
|
|
for _, listCase := range listCases {
|
|
client := &Client{
|
|
client: newMockClient(func(req *http.Request) (*http.Response, error) {
|
|
if !strings.HasPrefix(req.URL.Path, expectedURL) {
|
|
return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
|
|
}
|
|
query := req.URL.Query()
|
|
for key, expected := range listCase.expectedQueryParams {
|
|
actual := query.Get(key)
|
|
assert.Equal(t, actual, expected)
|
|
}
|
|
content, err := json.Marshal(types.NetworksPruneReport{
|
|
NetworksDeleted: []string{"network_id1", "network_id2"},
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: ioutil.NopCloser(bytes.NewReader(content)),
|
|
}, nil
|
|
}),
|
|
version: "1.25",
|
|
}
|
|
|
|
report, err := client.NetworksPrune(context.Background(), listCase.filters)
|
|
assert.NilError(t, err)
|
|
assert.Equal(t, len(report.NetworksDeleted), 2)
|
|
}
|
|
}
|