Skip to content

Commit

Permalink
Merge pull request #6485 from QiWang19/remote-ignore
Browse files Browse the repository at this point in the history
fix remote test --ignore & turn on more tests
  • Loading branch information
openshift-merge-robot authored Jun 4, 2020
2 parents 6682ea8 + f313a88 commit c133e55
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions pkg/domain/infra/tunnel/containers.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin
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
}
for _, c := range ctrs {
Expand Down Expand Up @@ -180,7 +180,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
Expand Down
5 changes: 3 additions & 2 deletions pkg/domain/infra/tunnel/pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion test/e2e/pod_rm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 0 additions & 2 deletions test/e2e/pod_stop_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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))
Expand Down
1 change: 0 additions & 1 deletion test/e2e/rm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit c133e55

Please sign in to comment.