opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 04:46:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12644 from leahneukirchen/events-timestamp

Browse Source 
remote events: convert TimeNano properly
This commit is contained in:
OpenShift Merge Robot
2022-01-13 15:26:53 +01:00
committed by GitHub
parent cb06133d42 5aedcb3643
commit 1b970e8598
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/domain/entities/events.go
View File

@ -42,7 +42,7 @@ func ConvertToLibpodEvent(e Event) *libpodEvents.Event {
Image: image, Image: image,
Name: name, Name: name,
Status: status, Status: status,
Time: time.Unix(e.Time, e.TimeNano), Time: time.Unix(0, e.TimeNano),
Type: t, Type: t,
Details: libpodEvents.Details{ Details: libpodEvents.Details{
Attributes: details, Attributes: details,

2
test/e2e/events_test.go
View File

@ -62,6 +62,8 @@ var _ = Describe("Podman events", func() {
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(len(result.OutputToStringArray())).To(BeNumerically(">=", 1), "Number of events") Expect(len(result.OutputToStringArray())).To(BeNumerically(">=", 1), "Number of events")
date := time.Now().Format("2006-01-02")
Expect(result.OutputToStringArray()).To(ContainElement(HavePrefix(date)), "event log has correct timestamp")
}) })
It("podman events with an event filter and container=cid", func() { It("podman events with an event filter and container=cid", func() {