opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-10 12:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Restore --format table support

Browse Source 
* system df
* events
  * fix error handling from go routine
  * update tests to use gomega matchers for better error messages
* system info
* version
* volume inspect

Signed-off-by: Jhon Honce <jhonce@redhat.com>
This commit is contained in:
Jhon Honce
2020-10-09 09:13:22 -07:00
parent 7ad631b819
commit eb4a746efc
14 changed files with 166 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test/e2e/events_test.go
View File

@ -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"))
})
})