summaryrefslogtreecommitdiff
path: root/pkg/domain/infra/tunnel/containers.go
diff options
context:
space:
mode:
authorQi Wang <qiwan@redhat.com>2020-06-03 15:02:39 -0400
committerQi Wang <qiwan@redhat.com>2020-06-03 15:04:58 -0400
commitf313a8844156a574a30186364f084ab11ae9b162 (patch)
tree8c656d4d7546b95255599bdb10cb0f68f798db6f /pkg/domain/infra/tunnel/containers.go
parentbba0a8be1a715fb0903ffc69abd5700a624d47e4 (diff)
downloadpodman-f313a8844156a574a30186364f084ab11ae9b162.tar.gz
podman-f313a8844156a574a30186364f084ab11ae9b162.tar.bz2
podman-f313a8844156a574a30186364f084ab11ae9b162.zip
fix remote test --ignore & turn on more tests
fix remote test --ignore & turn on more tests Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'pkg/domain/infra/tunnel/containers.go')
-rw-r--r--pkg/domain/infra/tunnel/containers.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 97b98eec2..1ed189a99 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -87,7 +87,7 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin
reports []*entities.StopReport
)
ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds)
- if err != nil {
+ if err != nil && !(options.Ignore && errors.Cause(err) == define.ErrNoSuchCtr) {
return nil, err
}
for _, c := range ctrs {
@@ -172,7 +172,7 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string,
namesOrIds = append(namesOrIds, id)
}
ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds)
- if err != nil {
+ if err != nil && !(options.Ignore && errors.Cause(err) == define.ErrNoSuchCtr) {
return nil, err
}
// TODO there is no endpoint for container eviction. Need to discuss