From c528d7a622267fcee0f38f25c94198b23deed9dd Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Thu, 11 Jul 2019 13:32:42 -0400 Subject: Use file-based eventer for integration tests This adds several top-level Podman flags for specifying different events backend types, which are then used in CI. It resolves a number of serious issues with events-based testing. Signed-off-by: Matthew Heon --- libpod/runtime_ctr.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'libpod/runtime_ctr.go') diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 0871b83a7..7ef7b8828 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -376,14 +376,9 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool, // Check that the container's in a good state to be removed if c.state.State == ContainerStateRunning { - if err := r.ociRuntime.stopContainer(c, c.StopTimeout()); err != nil { + if err := c.stop(c.StopTimeout()); err != nil { return errors.Wrapf(err, "cannot remove container %s as it could not be stopped", c.ID()) } - - // Need to update container state to make sure we know it's stopped - if err := c.waitForExitFileAndSync(); err != nil { - return err - } } // Check that all of our exec sessions have finished -- cgit v1.2.3-54-g00ecf