diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-07 00:05:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 00:05:42 +0200 |
| commit | 5a209b3d76addbf5ec658a7212a84ae7afce2fee (patch) | |
| tree | 27640604b1971129f83a855b7a225f703fa7e50c /test | |
| parent | 9e069cf7d9c9d19f014daaead7ad71e80b619652 (diff) | |
| parent | 9c5048544068c37e70d4e9b135180bfbc70e4b12 (diff) | |
| download | podman-5a209b3d76addbf5ec658a7212a84ae7afce2fee.tar.gz podman-5a209b3d76addbf5ec658a7212a84ae7afce2fee.tar.bz2 podman-5a209b3d76addbf5ec658a7212a84ae7afce2fee.zip | |
Merge pull request #10561 from vrothberg/fix-remote-events-label
remote events: support labels
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/events_test.go | 13 | ||||
| -rw-r--r-- | test/system/090-events.bats | 1 |
2 files changed, 5 insertions, 9 deletions
diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index 4dbbe9dd8..cc7c4d996 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -8,6 +8,7 @@ import ( "sync" "time" + "github.com/containers/podman/v3/libpod/events" . "github.com/containers/podman/v3/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" @@ -134,12 +135,10 @@ var _ = Describe("Podman events", func() { jsonArr := test.OutputToStringArray() Expect(test.OutputToStringArray()).ShouldNot(BeEmpty()) - eventsMap := make(map[string]string) - err := json.Unmarshal([]byte(jsonArr[0]), &eventsMap) + event := events.Event{} + err := json.Unmarshal([]byte(jsonArr[0]), &event) Expect(err).ToNot(HaveOccurred()) - Expect(eventsMap).To(HaveKey("Status")) - test = podmanTest.Podman([]string{"events", "--stream=false", "--format", "{{json.}}"}) test.WaitWithDefaultTimeout() Expect(test).To(Exit(0)) @@ -147,11 +146,9 @@ var _ = Describe("Podman events", func() { jsonArr = test.OutputToStringArray() Expect(test.OutputToStringArray()).ShouldNot(BeEmpty()) - eventsMap = make(map[string]string) - err = json.Unmarshal([]byte(jsonArr[0]), &eventsMap) + event = events.Event{} + err = json.Unmarshal([]byte(jsonArr[0]), &event) Expect(err).ToNot(HaveOccurred()) - - Expect(eventsMap).To(HaveKey("Status")) }) It("podman events --until future", func() { diff --git a/test/system/090-events.bats b/test/system/090-events.bats index 52936d7a0..d889bd7f9 100644 --- a/test/system/090-events.bats +++ b/test/system/090-events.bats @@ -6,7 +6,6 @@ load helpers @test "events with a filter by label" { - skip_if_remote "FIXME: -remote does not include labels in event output" cname=test-$(random_string 30 | tr A-Z a-z) labelname=$(random_string 10) labelvalue=$(random_string 15) |