summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-06-04 14:49:35 +0200
committerGitHub <noreply@github.com>2020-06-04 14:49:35 +0200
commit6682ea8f0d18e24d3fc40518da283c0b9030aba0 (patch)
tree1969f29c7f1a768205843e6cefb6ae51820d96e7
parent8cf74a79e326d4591226c9364851affdcbf13754 (diff)
parente77db144ab817a0e4c9f53c98abed511ce30baf7 (diff)
downloadpodman-6682ea8f0d18e24d3fc40518da283c0b9030aba0.tar.gz
podman-6682ea8f0d18e24d3fc40518da283c0b9030aba0.tar.bz2
podman-6682ea8f0d18e24d3fc40518da283c0b9030aba0.zip
Merge pull request #6481 from QiWang19/rm-test-stop
turn on remote stop_test
-rw-r--r--pkg/domain/infra/tunnel/containers.go8
-rw-r--r--test/e2e/stop_test.go2
2 files changed, 8 insertions, 2 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 97b98eec2..36a510081 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -86,6 +86,14 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin
var (
reports []*entities.StopReport
)
+ for _, cidFile := range options.CIDFiles {
+ content, err := ioutil.ReadFile(cidFile)
+ if err != nil {
+ return nil, errors.Wrapf(err, "error reading CIDFile %s", cidFile)
+ }
+ id := strings.Split(string(content), "\n")[0]
+ namesOrIds = append(namesOrIds, id)
+ }
ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds)
if err != nil {
return nil, err
diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go
index cd78a54e1..4ed0b6293 100644
--- a/test/e2e/stop_test.go
+++ b/test/e2e/stop_test.go
@@ -233,7 +233,6 @@ var _ = Describe("Podman stop", func() {
})
It("podman stop --cidfile", func() {
- SkipIfRemote()
tmpDir, err := ioutil.TempDir("", "")
Expect(err).To(BeNil())
@@ -258,7 +257,6 @@ var _ = Describe("Podman stop", func() {
})
It("podman stop multiple --cidfile", func() {
- SkipIfRemote()
tmpDir, err := ioutil.TempDir("", "")
Expect(err).To(BeNil())