diff options
author | baude <bbaude@redhat.com> | 2018-02-20 10:57:37 -0600 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-02-21 14:22:36 +0000 |
commit | 6ce70a33c5825c0f4d2afae7643db95e8b7d46f1 (patch) | |
tree | 5d387d97c7cac2a0ca8b9c8a8c0ceed2a8c472ff /test/e2e/inspect_test.go | |
parent | e929e7de4cf537c5de5817b7c086bc4883a8b93a (diff) | |
download | podman-6ce70a33c5825c0f4d2afae7643db95e8b7d46f1.tar.gz podman-6ce70a33c5825c0f4d2afae7643db95e8b7d46f1.tar.bz2 podman-6ce70a33c5825c0f4d2afae7643db95e8b7d46f1.zip |
Inspect output should be in array form
Inspect should be able to inspect one or more containers depending
on the user input. Therefore, inspect output should be in array
format so the consumer could potentially iterate it. This PR allows
users to specify one more or containers|images|or a mix for
inspection. The output, as stated, is therefore in array form. This
holds true even for a singular image.
In the case that the user enters an invalid container|image "name", we
handle that gracefully. Podman will output json for the valid names
until it reaches the invalid one. For example:
In this case, podman will out the json for alpine and then print an
error about 123 being invalid. It will not continute onto busybox.
This behavior imatates docker.
This addresses issue #360
Signed-off-by: baude <bbaude@redhat.com>
Closes: #371
Approved by: baude
Diffstat (limited to 'test/e2e/inspect_test.go')
-rw-r--r-- | test/e2e/inspect_test.go | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go index b6020f53b..e04465eb5 100644 --- a/test/e2e/inspect_test.go +++ b/test/e2e/inspect_test.go @@ -2,7 +2,6 @@ package integration import ( "os" - "strings" . "github.com/onsi/ginkgo" @@ -36,7 +35,7 @@ var _ = Describe("Podman inspect", func() { Expect(session.ExitCode()).To(Equal(0)) Expect(session.IsJSONOutputValid()).To(BeTrue()) imageData := session.InspectImageJSON() - Expect(imageData.RepoTags[0]).To(Equal("docker.io/library/alpine:latest")) + Expect(imageData[0].RepoTags[0]).To(Equal("docker.io/library/alpine:latest")) }) It("podman inspect bogus container", func() { @@ -70,6 +69,24 @@ var _ = Describe("Podman inspect", func() { result.WaitWithDefaultTimeout() Expect(result.ExitCode()).To(Equal(0)) conData := result.InspectContainerToJSON() - Expect(conData.SizeRootFs).To(BeNumerically(">", 0)) + Expect(conData[0].SizeRootFs).To(BeNumerically(">", 0)) }) + + It("podman inspect container and image", func() { + ls, ec, _ := podmanTest.RunLsContainer("") + Expect(ec).To(Equal(0)) + cid := ls.OutputToString() + + result := podmanTest.Podman([]string{"inspect", "--format={{.ID}}", cid, ALPINE}) + result.WaitWithDefaultTimeout() + Expect(result.ExitCode()).To(Equal(0)) + Expect(len(result.OutputToStringArray())).To(Equal(2)) + }) + + It("podman inspect -l with additional input should fail", func() { + result := podmanTest.Podman([]string{"inspect", "-l", "1234foobar"}) + result.WaitWithDefaultTimeout() + Expect(result.ExitCode()).To(Equal(125)) + }) + }) |