Merge pull request #7987 from jwhonce/jira/run-898-5

Restore --format table support

2 files changed, 16 insertions, 11 deletions

diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go
index 5155bcbc7..572e55fe5 100644
--- a/test/e2e/build_test.go
+++ b/test/e2e/build_test.go
@@ -220,7 +220,6 @@ var _ = Describe("Podman build", func() {
 	})
 
 	It("podman build --http_proxy flag", func() {
-		SkipIfRemote("FIXME: This is broken should be fixed") // This is hanging currently.
 		os.Setenv("http_proxy", "1.2.3.4")
 		if IsRemote() {
 			podmanTest.StopRemoteService()
diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go
index bea8caa93..b37bd584e 100644
--- a/test/e2e/events_test.go
+++ b/test/e2e/events_test.go
@@ -10,6 +10,7 @@ import (
 	. "github.com/containers/podman/v2/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega/gexec"
 )
 
 var _ = Describe("Podman events", func() {
@@ -126,26 +127,31 @@ var _ = Describe("Podman events", func() {
 		SkipIfNotFedora()
 		_, ec, _ := podmanTest.RunLsContainer("")
 		Expect(ec).To(Equal(0))
+
 		test := podmanTest.Podman([]string{"events", "--stream=false", "--format", "json"})
 		test.WaitWithDefaultTimeout()
-		Expect(test.ExitCode()).To(BeZero())
+		Expect(test).To(Exit(0))
+
 		jsonArr := test.OutputToStringArray()
-		Expect(len(jsonArr)).To(Not(BeZero()))
+		Expect(test.OutputToStringArray()).ShouldNot(BeEmpty())
+
 		eventsMap := make(map[string]string)
 		err := json.Unmarshal([]byte(jsonArr[0]), &eventsMap)
-		Expect(err).To(BeNil())
-		_, exist := eventsMap["Status"]
-		Expect(exist).To(BeTrue())
+		Expect(err).ToNot(HaveOccurred())
+
+		Expect(eventsMap).To(HaveKey("Status"))
 
 		test = podmanTest.Podman([]string{"events", "--stream=false", "--format", "{{json.}}"})
 		test.WaitWithDefaultTimeout()
-		Expect(test.ExitCode()).To(BeZero())
+		Expect(test).To(Exit(0))
+
 		jsonArr = test.OutputToStringArray()
-		Expect(len(jsonArr)).To(Not(BeZero()))
+		Expect(test.OutputToStringArray()).ShouldNot(BeEmpty())
+
 		eventsMap = make(map[string]string)
 		err = json.Unmarshal([]byte(jsonArr[0]), &eventsMap)
-		Expect(err).To(BeNil())
-		_, exist = eventsMap["Status"]
-		Expect(exist).To(BeTrue())
+		Expect(err).ToNot(HaveOccurred())
+
+		Expect(eventsMap).To(HaveKey("Status"))
 	})
 })