summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/commit_test.go8
-rw-r--r--test/e2e/create_test.go2
-rw-r--r--test/e2e/import_test.go2
-rw-r--r--test/e2e/inspect_test.go23
-rw-r--r--test/e2e/libpod_suite_test.go8
-rw-r--r--test/e2e/tag_test.go12
6 files changed, 36 insertions, 19 deletions
diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go
index c807b46c5..154a83bd2 100644
--- a/test/e2e/commit_test.go
+++ b/test/e2e/commit_test.go
@@ -40,7 +40,7 @@ var _ = Describe("Podman commit", func() {
check := podmanTest.Podman([]string{"inspect", "foobar.com/test1-image:latest"})
check.WaitWithDefaultTimeout()
data := check.InspectImageJSON()
- Expect(StringInSlice("foobar.com/test1-image:latest", data.RepoTags)).To(BeTrue())
+ Expect(StringInSlice("foobar.com/test1-image:latest", data[0].RepoTags)).To(BeTrue())
})
It("podman commit container with message", func() {
@@ -55,7 +55,7 @@ var _ = Describe("Podman commit", func() {
check := podmanTest.Podman([]string{"inspect", "foobar.com/test1-image:latest"})
check.WaitWithDefaultTimeout()
data := check.InspectImageJSON()
- Expect(data.Comment).To(Equal("testing-commit"))
+ Expect(data[0].Comment).To(Equal("testing-commit"))
})
It("podman commit container with author", func() {
@@ -70,7 +70,7 @@ var _ = Describe("Podman commit", func() {
check := podmanTest.Podman([]string{"inspect", "foobar.com/test1-image:latest"})
check.WaitWithDefaultTimeout()
data := check.InspectImageJSON()
- Expect(data.Author).To(Equal("snoopy"))
+ Expect(data[0].Author).To(Equal("snoopy"))
})
It("podman commit container with change flag", func() {
@@ -88,7 +88,7 @@ var _ = Describe("Podman commit", func() {
check.WaitWithDefaultTimeout()
data := check.InspectImageJSON()
foundBlue := false
- for _, i := range data.Labels {
+ for _, i := range data[0].Labels {
if i == "blue" {
foundBlue = true
break
diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go
index e54e35761..ebe4ed924 100644
--- a/test/e2e/create_test.go
+++ b/test/e2e/create_test.go
@@ -38,7 +38,7 @@ var _ = Describe("Podman create", func() {
check := podmanTest.Podman([]string{"inspect", "-l"})
check.WaitWithDefaultTimeout()
data := check.InspectContainerToJSON()
- Expect(data.ID).To(ContainSubstring(cid))
+ Expect(data[0].ID).To(ContainSubstring(cid))
})
It("podman create container based on a remote image", func() {
diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go
index ed90ede0f..9ad650948 100644
--- a/test/e2e/import_test.go
+++ b/test/e2e/import_test.go
@@ -101,7 +101,7 @@ var _ = Describe("Podman import", func() {
results.WaitWithDefaultTimeout()
Expect(results.ExitCode()).To(Equal(0))
imageData := results.InspectImageJSON()
- Expect(imageData.ContainerConfig.Cmd[0]).To(Equal("/bin/bash"))
+ Expect(imageData[0].ContainerConfig.Cmd[0]).To(Equal("/bin/bash"))
})
})
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))
+ })
+
})
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index c479a6cef..bd117d5f4 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -228,8 +228,8 @@ func (s *PodmanSession) IsJSONOutputValid() bool {
// InspectContainerToJSON takes the session output of an inspect
// container and returns json
-func (s *PodmanSession) InspectContainerToJSON() inspect.ContainerData {
- var i inspect.ContainerData
+func (s *PodmanSession) InspectContainerToJSON() []inspect.ContainerData {
+ var i []inspect.ContainerData
err := json.Unmarshal(s.Out.Contents(), &i)
Expect(err).To(BeNil())
return i
@@ -237,8 +237,8 @@ func (s *PodmanSession) InspectContainerToJSON() inspect.ContainerData {
// InspectImageJSON takes the session output of an inspect
// image and returns json
-func (s *PodmanSession) InspectImageJSON() inspect.ImageData {
- var i inspect.ImageData
+func (s *PodmanSession) InspectImageJSON() []inspect.ImageData {
+ var i []inspect.ImageData
err := json.Unmarshal(s.Out.Contents(), &i)
Expect(err).To(BeNil())
return i
diff --git a/test/e2e/tag_test.go b/test/e2e/tag_test.go
index c5ec5710d..7f14c7eb4 100644
--- a/test/e2e/tag_test.go
+++ b/test/e2e/tag_test.go
@@ -37,8 +37,8 @@ var _ = Describe("Podman tag", func() {
results.WaitWithDefaultTimeout()
Expect(results.ExitCode()).To(Equal(0))
inspectData := results.InspectImageJSON()
- Expect(StringInSlice("docker.io/library/alpine:latest", inspectData.RepoTags)).To(BeTrue())
- Expect(StringInSlice("foobar:latest", inspectData.RepoTags)).To(BeTrue())
+ Expect(StringInSlice("docker.io/library/alpine:latest", inspectData[0].RepoTags)).To(BeTrue())
+ Expect(StringInSlice("foobar:latest", inspectData[0].RepoTags)).To(BeTrue())
})
It("podman tag shortname", func() {
@@ -50,8 +50,8 @@ var _ = Describe("Podman tag", func() {
results.WaitWithDefaultTimeout()
Expect(results.ExitCode()).To(Equal(0))
inspectData := results.InspectImageJSON()
- Expect(StringInSlice("docker.io/library/alpine:latest", inspectData.RepoTags)).To(BeTrue())
- Expect(StringInSlice("foobar:latest", inspectData.RepoTags)).To(BeTrue())
+ Expect(StringInSlice("docker.io/library/alpine:latest", inspectData[0].RepoTags)).To(BeTrue())
+ Expect(StringInSlice("foobar:latest", inspectData[0].RepoTags)).To(BeTrue())
})
It("podman tag shortname:tag", func() {
@@ -63,7 +63,7 @@ var _ = Describe("Podman tag", func() {
results.WaitWithDefaultTimeout()
Expect(results.ExitCode()).To(Equal(0))
inspectData := results.InspectImageJSON()
- Expect(StringInSlice("docker.io/library/alpine:latest", inspectData.RepoTags)).To(BeTrue())
- Expect(StringInSlice("foobar:new", inspectData.RepoTags)).To(BeTrue())
+ Expect(StringInSlice("docker.io/library/alpine:latest", inspectData[0].RepoTags)).To(BeTrue())
+ Expect(StringInSlice("foobar:new", inspectData[0].RepoTags)).To(BeTrue())
})
})
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 14:41:52 +0000