mirror of
https://github.com/containers/podman.git
synced 2025-07-20 20:13:40 +08:00
fix podman events with custom format
podman events --format {{.ID}} was not working since the template was converted to a range but we only render each event individually. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
@ -85,7 +85,9 @@ func eventsCmd(cmd *cobra.Command, _ []string) error {
|
|||||||
doJSON = report.IsJSON(eventFormat)
|
doJSON = report.IsJSON(eventFormat)
|
||||||
if !doJSON {
|
if !doJSON {
|
||||||
var err error
|
var err error
|
||||||
rpt, err = report.New(os.Stdout, cmd.Name()).Parse(report.OriginUser, eventFormat)
|
// Use OriginUnknown so it does not add an extra range since it
|
||||||
|
// will only be called for each single element and not a slice.
|
||||||
|
rpt, err = report.New(os.Stdout, cmd.Name()).Parse(report.OriginUnknown, eventFormat)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -153,6 +153,13 @@ var _ = Describe("Podman events", func() {
|
|||||||
event = events.Event{}
|
event = events.Event{}
|
||||||
err = json.Unmarshal([]byte(jsonArr[0]), &event)
|
err = json.Unmarshal([]byte(jsonArr[0]), &event)
|
||||||
Expect(err).ToNot(HaveOccurred())
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
|
||||||
|
test = podmanTest.Podman([]string{"events", "--stream=false", "--filter=type=container", "--format", "ID: {{.ID}}"})
|
||||||
|
test.WaitWithDefaultTimeout()
|
||||||
|
Expect(test).To(Exit(0))
|
||||||
|
arr := test.OutputToStringArray()
|
||||||
|
Expect(len(arr)).To(BeNumerically(">", 1))
|
||||||
|
Expect(arr[0]).To(MatchRegexp("ID: [a-fA-F0-9]{64}"))
|
||||||
})
|
})
|
||||||
|
|
||||||
It("podman events --until future", func() {
|
It("podman events --until future", func() {
|
||||||
|
Reference in New Issue
Block a user