@@ -20,8 +20,9 @@ parent = "smn_cli"

                               values are "image" or "container"

       -s, --size              Display total file sizes if the type is container

-By default, this will render all results in a JSON array. If a format is

-specified, the given template will be executed for each result.

+By default, this will render all results in a JSON array. If the container and

+image have the same name, this will return container JSON for unspecified type.

+If a format is specified, the given template will be executed for each result.

 Go's [text/template](http://golang.org/pkg/text/template/) package

 describes all the details of the format.

@@ -49,8 +49,12 @@ func (s *DockerSuite) TestInspectDefault(c *check.C) {

 	//Both the container and image are named busybox. docker inspect will fetch the container JSON.

 	//If the container JSON is not available, it will go for the image JSON.

-	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "true")

-	dockerCmd(c, "inspect", "busybox")

+	out, _ := dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "true")

+	containerID := strings.TrimSpace(out)

+

+	inspectOut, err := inspectField("busybox", "Id")

+	c.Assert(err, checker.IsNil)

+	c.Assert(strings.TrimSpace(inspectOut), checker.Equals, containerID)

 }

 func (s *DockerSuite) TestInspectStatus(c *check.C) {

@@ -329,13 +333,15 @@ func (s *DockerSuite) TestInspectSizeFlagImage(c *check.C) {

 }

 func (s *DockerSuite) TestInspectTempateError(c *check.C) {

-	//Both the container and image are named busybox. docker inspect will fetch container

-	//JSON State.Running field. If the field is true, it's a container.

+	// Template parsing error for both the container and image.

-	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "top")

+	dockerCmd(c, "run", "--name=container1", "-d", "busybox", "top")

-	out, _, err := dockerCmdWithError("inspect", "--type=container", "--format='Format container: {{.ThisDoesNotExist}}'", "busybox")

+	out, _, err := dockerCmdWithError("inspect", "--type=container", "--format='Format container: {{.ThisDoesNotExist}}'", "container1")

+	c.Assert(err, check.Not(check.IsNil))

+	c.Assert(out, checker.Contains, "Template parsing error")

+	out, _, err = dockerCmdWithError("inspect", "--type=image", "--format='Format container: {{.ThisDoesNotExist}}'", "busybox")

 	c.Assert(err, check.Not(check.IsNil))

 	c.Assert(out, checker.Contains, "Template parsing error")

 }

@@ -16,8 +16,9 @@ CONTAINER|IMAGE [CONTAINER|IMAGE...]

 This displays all the information available in Docker for a given

 container or image. By default, this will render all results in a JSON

-array. If a format is specified, the given template will be executed for

-each result.

+array. If the container and image have the same name, this will return 

+container JSON for unspecified type. If a format is specified, the given

+template will be executed for each result.

 # OPTIONS

 **--help**