diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-13 15:26:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 15:26:53 +0100 |
| commit | 1b970e8598bd414dc2e84fbb1334f42065ed8233 (patch) | |
| tree | cdd77a5c767bd192f2976840fe40b4127f4e3034 | |
| parent | cb06133d42e4041fe19d2e66f254abf188f1025e (diff) | |
| parent | 5aedcb36435048dc06a18476aed2cfda1bf41031 (diff) | |
| download | podman-1b970e8598bd414dc2e84fbb1334f42065ed8233.tar.gz podman-1b970e8598bd414dc2e84fbb1334f42065ed8233.tar.bz2 podman-1b970e8598bd414dc2e84fbb1334f42065ed8233.zip | |
Merge pull request #12644 from leahneukirchen/events-timestamp
remote events: convert TimeNano properly
| -rw-r--r-- | pkg/domain/entities/events.go | 2 | ||||
| -rw-r--r-- | test/e2e/events_test.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkg/domain/entities/events.go b/pkg/domain/entities/events.go index 73a375b94..fa815d7b9 100644 --- a/pkg/domain/entities/events.go +++ b/pkg/domain/entities/events.go @@ -42,7 +42,7 @@ func ConvertToLibpodEvent(e Event) *libpodEvents.Event { Image: image, Name: name, Status: status, - Time: time.Unix(e.Time, e.TimeNano), + Time: time.Unix(0, e.TimeNano), Type: t, Details: libpodEvents.Details{ Attributes: details, diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index 39f495460..3b5b8ac6c 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -62,6 +62,8 @@ var _ = Describe("Podman events", func() { result.WaitWithDefaultTimeout() Expect(result).Should(Exit(0)) 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() { |