kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #17113 from mountkin/validate-filter

Browse source 
make sure the value of the dangling filter is correct
This commit is contained in:
David Calavera 2015-10-16 16:32:11 -07:00
commit c3f42b29a8
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
graph/list.go
View file

@ -51,8 +51,10 @@ func (s *TagStore) Images(filterArgs, filter string, all bool) ([]*types.Image,
if i, ok := imageFilters["dangling"]; ok { if i, ok := imageFilters["dangling"]; ok {
for _, value := range i { for _, value := range i {
if strings.ToLower(value) == "true" { if v := strings.ToLower(value); v == "true" {
filtTagged = false filtTagged = false
} else if v != "false" {
return nil, fmt.Errorf("Invalid filter 'dangling=%s'", v)
} }
} }
} }

7
integration-cli/docker_cli_images_test.go
View file

@ -7,6 +7,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/docker/docker/pkg/integration/checker"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/go-check/check" "github.com/go-check/check"
) )
@ -197,3 +198,9 @@ func (s *DockerSuite) TestImagesEnsureDanglingImageOnlyListedOnce(c *check.C) {
c.Fatalf("expected 1 dangling image, got %d: %s", a, out) c.Fatalf("expected 1 dangling image, got %d: %s", a, out)
} }
} }
func (s *DockerSuite) TestImagesWithIncorrectFilter(c *check.C) {
out, _, err := dockerCmdWithError("images", "-f", "dangling=invalid")
c.Assert(err, check.NotNil)
c.Assert(out, checker.Contains, "Invalid filter")
}