diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-07-11 13:32:42 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-08-05 14:40:28 -0400 |
| commit | c528d7a622267fcee0f38f25c94198b23deed9dd (patch) | |
| tree | 5b4f6a4fe723428ee317fbcd6c0588506fac8233 /libpod/runtime_ctr.go | |
| parent | 58b1b99982cdaad5e0d5eccaf008aa343f8fefd2 (diff) | |
| download | podman-c528d7a622267fcee0f38f25c94198b23deed9dd.tar.gz podman-c528d7a622267fcee0f38f25c94198b23deed9dd.tar.bz2 podman-c528d7a622267fcee0f38f25c94198b23deed9dd.zip | |
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 <matthew.heon@pm.me>
Diffstat (limited to 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 7 |
1 files changed, 1 insertions, 6 deletions
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 |