diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-04-25 13:51:33 -0500 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-04-27 09:08:27 -0500 |
| commit | a7b3310db567309e8c21c4c49a37de9d18646a4c (patch) | |
| tree | 73809829c0c27b609a1bdce71b99ade0b7c09cca /pkg/domain/infra/abi/containers.go | |
| parent | 2afe579c064923841a55d57458fac4d91bec8173 (diff) | |
| download | podman-a7b3310db567309e8c21c4c49a37de9d18646a4c.tar.gz podman-a7b3310db567309e8c21c4c49a37de9d18646a4c.tar.bz2 podman-a7b3310db567309e8c21c4c49a37de9d18646a4c.zip | |
enable integration tests for restart
enable integrations tests for container restart. fixed bug where --running was not being honored.
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/domain/infra/abi/containers.go')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 9844d1d96..e09891760 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -217,12 +217,23 @@ func (ic *ContainerEngine) ContainerKill(ctx context.Context, namesOrIds []strin } func (ic *ContainerEngine) ContainerRestart(ctx context.Context, namesOrIds []string, options entities.RestartOptions) ([]*entities.RestartReport, error) { var ( + ctrs []*libpod.Container + err error reports []*entities.RestartReport ) - ctrs, err := getContainersByContext(options.All, options.Latest, namesOrIds, ic.Libpod) - if err != nil { - return nil, err + + if options.Running { + ctrs, err = ic.Libpod.GetRunningContainers() + if err != nil { + return nil, err + } + } else { + ctrs, err = getContainersByContext(options.All, options.Latest, namesOrIds, ic.Libpod) + if err != nil { + return nil, err + } } + for _, con := range ctrs { timeout := con.StopTimeout() if options.Timeout != nil { |