Update integration tests when container and image have same name

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 9fbb1306e83576086e924ff4fbf35b9a74beb28a
Component: engine
This commit is contained in:
Wen Cheng Ma
2015-12-28 16:29:39 +08:00
parent 88aefd745d
commit 4b86854122
3 changed files with 18 additions and 10 deletions

View File

@ -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.