summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/info_test.go14
-rw-r--r--test/e2e/rm_test.go1
2 files changed, 4 insertions, 11 deletions
diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go
index e5173e7a1..ff3615dcd 100644
--- a/test/e2e/info_test.go
+++ b/test/e2e/info_test.go
@@ -16,7 +16,6 @@ var _ = Describe("Podman Info", func() {
)
BeforeEach(func() {
- Skip(v2fail)
tempdir, err = CreateTempDirInTempDir()
if err != nil {
os.Exit(1)
@@ -38,22 +37,17 @@ var _ = Describe("Podman Info", func() {
Expect(session.ExitCode()).To(Equal(0))
})
- It("podman system info json output", func() {
- session := podmanTest.Podman([]string{"system", "info", "--format=json"})
- session.WaitWithDefaultTimeout()
- Expect(session.ExitCode()).To(Equal(0))
- })
- It("podman info --format JSON GO template", func() {
- session := podmanTest.Podman([]string{"info", "--format", "{{ json .}}"})
+ It("podman info --format GO template", func() {
+ session := podmanTest.Podman([]string{"info", "--format", "{{.Store.GraphRoot}}"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- Expect(session.IsJSONOutputValid()).To(BeTrue())
})
It("podman info --format GO template", func() {
- session := podmanTest.Podman([]string{"info", "--format", "{{ .Store.GraphRoot }}"})
+ session := podmanTest.Podman([]string{"info", "--format", "{{.Registries}}"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
+ Expect(session.OutputToString()).To(ContainSubstring("registry"))
})
})
diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go
index 83d20afa9..4eb568879 100644
--- a/test/e2e/rm_test.go
+++ b/test/e2e/rm_test.go
@@ -17,7 +17,6 @@ var _ = Describe("Podman rm", func() {
)
BeforeEach(func() {
- Skip(v2fail)
tempdir, err = CreateTempDirInTempDir()
if err != nil {
os.Exit(1)