diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-04 14:55:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-04 14:55:53 +0200 |
| commit | b8dbc1159433f9b5e9d8436b25443bd335917235 (patch) | |
| tree | f3c7473a9467e87fc60c9a473c5a24f093ffcc08 | |
| parent | f7233a2da7fe79075ade9f34adc702c5d2eb76bc (diff) | |
| parent | 86610c7852ee992d6c0b89d4a5cd70081950951d (diff) | |
| download | podman-b8dbc1159433f9b5e9d8436b25443bd335917235.tar.gz podman-b8dbc1159433f9b5e9d8436b25443bd335917235.tar.bz2 podman-b8dbc1159433f9b5e9d8436b25443bd335917235.zip | |
Merge pull request #10558 from vrothberg/fix-10529
remote events: fix --stream=false
| -rw-r--r-- | pkg/api/handlers/compat/events.go | 2 | ||||
| -rw-r--r-- | test/system/090-events.bats | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkg/api/handlers/compat/events.go b/pkg/api/handlers/compat/events.go index 405e616c5..9fbac91e0 100644 --- a/pkg/api/handlers/compat/events.go +++ b/pkg/api/handlers/compat/events.go @@ -75,7 +75,7 @@ func GetEvents(w http.ResponseWriter, r *http.Request) { coder := json.NewEncoder(w) coder.SetEscapeHTML(true) - for stream := true; stream; stream = query.Stream { + for { select { case err := <-errorChannel: if err != nil { diff --git a/test/system/090-events.bats b/test/system/090-events.bats index 09c2d0c10..52936d7a0 100644 --- a/test/system/090-events.bats +++ b/test/system/090-events.bats @@ -27,7 +27,7 @@ load helpers } @test "image events" { - skip_if_remote "FIXME: remove events on podman-remote seem to be broken" + skip_if_remote "remote does not support --events-backend" pushedDir=$PODMAN_TMPDIR/dir mkdir -p $pushedDir @@ -86,7 +86,5 @@ function _events_disjunctive_filters() { } @test "events with disjunctive filters - default" { - # NOTE: the last event for bar doesn't show up reliably. - skip_if_remote "FIXME #10529: remote events lose data" _events_disjunctive_filters "" } |