diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-21 10:55:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 10:55:40 -0400 |
| commit | f8e2a3500e3daadf21137d1647cabf9ef20b2114 (patch) | |
| tree | a4825917b192332599841cdcc41096af39a4b474 /test/e2e/events_test.go | |
| parent | 644b5bc8a35760654824c46cad8618e0d6e634bc (diff) | |
| parent | dea93c27d2809cd5a04563d27cf00a8e682884c8 (diff) | |
| download | podman-f8e2a3500e3daadf21137d1647cabf9ef20b2114.tar.gz podman-f8e2a3500e3daadf21137d1647cabf9ef20b2114.tar.bz2 podman-f8e2a3500e3daadf21137d1647cabf9ef20b2114.zip | |
Merge pull request #6902 from vrothberg/events-endpoint
events endpoint: fix panic and race condition
Diffstat (limited to 'test/e2e/events_test.go')
| -rw-r--r-- | test/e2e/events_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index 93c51098f..9b527b88e 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -136,6 +136,7 @@ var _ = Describe("Podman events", func() { Expect(ec).To(Equal(0)) test := podmanTest.Podman([]string{"events", "--stream=false", "--format", "json"}) test.WaitWithDefaultTimeout() + Expect(test.ExitCode()).To(BeZero()) jsonArr := test.OutputToStringArray() Expect(len(jsonArr)).To(Not(BeZero())) eventsMap := make(map[string]string) @@ -143,10 +144,10 @@ var _ = Describe("Podman events", func() { Expect(err).To(BeNil()) _, exist := eventsMap["Status"] Expect(exist).To(BeTrue()) - Expect(test.ExitCode()).To(BeZero()) test = podmanTest.Podman([]string{"events", "--stream=false", "--format", "{{json.}}"}) test.WaitWithDefaultTimeout() + Expect(test.ExitCode()).To(BeZero()) jsonArr = test.OutputToStringArray() Expect(len(jsonArr)).To(Not(BeZero())) eventsMap = make(map[string]string) @@ -154,6 +155,5 @@ var _ = Describe("Podman events", func() { Expect(err).To(BeNil()) _, exist = eventsMap["Status"] Expect(exist).To(BeTrue()) - Expect(test.ExitCode()).To(BeZero()) }) }) |