From 8819b530dbb692de6eac5cf0e67700374f14aa09 Mon Sep 17 00:00:00 2001 From: Shijiang Wei Date: Wed, 25 Nov 2015 10:43:14 +0800 Subject: [PATCH] add a test to make sure port is allowed in images filter Signed-off-by: Shijiang Wei --- integration-cli/docker_cli_images_test.go | 36 +++++++++++++++-------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/integration-cli/docker_cli_images_test.go b/integration-cli/docker_cli_images_test.go index 42e3e46283..027d8fe53c 100644 --- a/integration-cli/docker_cli_images_test.go +++ b/integration-cli/docker_cli_images_test.go @@ -20,24 +20,22 @@ func (s *DockerSuite) TestImagesEnsureImageIsListed(c *check.C) { func (s *DockerSuite) TestImagesEnsureImageWithTagIsListed(c *check.C) { testRequires(c, DaemonIsLinux) - _, err := buildImage("imagewithtag:v1", - `FROM scratch - MAINTAINER dockerio1`, true) - c.Assert(err, check.IsNil) - _, err = buildImage("imagewithtag:v2", - `FROM scratch - MAINTAINER dockerio1`, true) - c.Assert(err, check.IsNil) + name := "imagewithtag" + dockerCmd(c, "tag", "busybox", name+":v1") + dockerCmd(c, "tag", "busybox", name+":v1v1") + dockerCmd(c, "tag", "busybox", name+":v2") - imagesOut, _ := dockerCmd(c, "images", "imagewithtag:v1") - c.Assert(imagesOut, checker.Contains, "imagewithtag") + imagesOut, _ := dockerCmd(c, "images", name+":v1") + c.Assert(imagesOut, checker.Contains, name) c.Assert(imagesOut, checker.Contains, "v1") c.Assert(imagesOut, checker.Not(checker.Contains), "v2") + c.Assert(imagesOut, checker.Not(checker.Contains), "v1v1") - imagesOut, _ = dockerCmd(c, "images", "imagewithtag") - c.Assert(imagesOut, checker.Contains, "imagewithtag") + imagesOut, _ = dockerCmd(c, "images", name) + c.Assert(imagesOut, checker.Contains, name) c.Assert(imagesOut, checker.Contains, "v1") + c.Assert(imagesOut, checker.Contains, "v1v1") c.Assert(imagesOut, checker.Contains, "v2") } @@ -221,3 +219,17 @@ func (s *DockerSuite) TestImagesEnsureImagesFromScratchShown(c *check.C) { // images should contain images built from scratch c.Assert(out, checker.Contains, stringid.TruncateID(id)) } + +// #18181 +func (s *DockerSuite) TestImagesFilterNameWithPort(c *check.C) { + tag := "a.b.c.d:5000/hello" + dockerCmd(c, "tag", "busybox", tag) + out, _ := dockerCmd(c, "images", tag) + c.Assert(out, checker.Contains, tag) + + out, _ = dockerCmd(c, "images", tag+":latest") + c.Assert(out, checker.Contains, tag) + + out, _ = dockerCmd(c, "images", tag+":no-such-tag") + c.Assert(out, checker.Not(checker.Contains), tag) +}