mirror of
https://github.com/containers/podman
synced 2024-10-21 01:34:37 +00:00
fix remote test --ignore & turn on more tests
fix remote test --ignore & turn on more tests Signed-off-by: Qi Wang <qiwan@redhat.com>
This commit is contained in:
parent
bba0a8be1a
commit
f313a88441
|
@ -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
|
||||
|
|
|
@ -3,6 +3,7 @@ package tunnel
|
|||
import (
|
||||
"context"
|
||||
|
||||
"github.com/containers/libpod/libpod/define"
|
||||
"github.com/containers/libpod/pkg/bindings/pods"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/containers/libpod/pkg/specgen"
|
||||
|
@ -89,7 +90,7 @@ func (ic *ContainerEngine) PodStop(ctx context.Context, namesOrIds []string, opt
|
|||
timeout int = -1
|
||||
)
|
||||
foundPods, err := getPodsByContext(ic.ClientCxt, options.All, namesOrIds)
|
||||
if err != nil {
|
||||
if err != nil && !(options.Ignore && errors.Cause(err) == define.ErrNoSuchPod) {
|
||||
return nil, err
|
||||
}
|
||||
if options.Timeout != -1 {
|
||||
|
@ -155,7 +156,7 @@ func (ic *ContainerEngine) PodStart(ctx context.Context, namesOrIds []string, op
|
|||
func (ic *ContainerEngine) PodRm(ctx context.Context, namesOrIds []string, options entities.PodRmOptions) ([]*entities.PodRmReport, error) {
|
||||
var reports []*entities.PodRmReport
|
||||
foundPods, err := getPodsByContext(ic.ClientCxt, options.All, namesOrIds)
|
||||
if err != nil {
|
||||
if err != nil && !(options.Ignore && errors.Cause(err) == define.ErrNoSuchPod) {
|
||||
return nil, err
|
||||
}
|
||||
for _, p := range foundPods {
|
||||
|
|
|
@ -213,7 +213,6 @@ var _ = Describe("Podman pod rm", func() {
|
|||
})
|
||||
|
||||
It("podman rm --ignore bogus pod and a running pod", func() {
|
||||
SkipIfRemote()
|
||||
|
||||
_, ec, podid1 := podmanTest.CreatePod("")
|
||||
Expect(ec).To(Equal(0))
|
||||
|
|
|
@ -39,7 +39,6 @@ var _ = Describe("Podman pod stop", func() {
|
|||
})
|
||||
|
||||
It("podman pod stop --ignore bogus pod", func() {
|
||||
SkipIfRemote()
|
||||
|
||||
session := podmanTest.Podman([]string{"pod", "stop", "--ignore", "123"})
|
||||
session.WaitWithDefaultTimeout()
|
||||
|
@ -60,7 +59,6 @@ var _ = Describe("Podman pod stop", func() {
|
|||
})
|
||||
|
||||
It("podman stop --ignore bogus pod and a running pod", func() {
|
||||
SkipIfRemote()
|
||||
|
||||
_, ec, podid1 := podmanTest.CreatePod("")
|
||||
Expect(ec).To(Equal(0))
|
||||
|
|
|
@ -233,7 +233,6 @@ var _ = Describe("Podman rm", func() {
|
|||
})
|
||||
|
||||
It("podman rm --ignore bogus container and a running container", func() {
|
||||
SkipIfRemote()
|
||||
|
||||
session := podmanTest.RunTopContainer("test1")
|
||||
session.WaitWithDefaultTimeout()
|
||||
|
|
Loading…
Reference in a new issue