diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-22 13:06:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-22 13:06:53 +0000 |
| commit | 6900b5a2be3854d3d109f5fff546bea4de91ac92 (patch) | |
| tree | 9eda94b7baa20f61a2f172b86a417a5d872cb724 /test/e2e/attach_test.go | |
| parent | 141688cd6fedc02c2f267020095f0ceae15934f5 (diff) | |
| parent | f949cfddaa0ff47247df8424d7ddb793088b49e2 (diff) | |
| download | podman-6900b5a2be3854d3d109f5fff546bea4de91ac92.tar.gz podman-6900b5a2be3854d3d109f5fff546bea4de91ac92.tar.bz2 podman-6900b5a2be3854d3d109f5fff546bea4de91ac92.zip | |
Merge pull request #7717 from rhatdan/attach
Fix up attach tests for podman remote
Diffstat (limited to 'test/e2e/attach_test.go')
| -rw-r--r-- | test/e2e/attach_test.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go index 7b18f71ac..8065f6298 100644 --- a/test/e2e/attach_test.go +++ b/test/e2e/attach_test.go @@ -40,7 +40,6 @@ var _ = Describe("Podman attach", func() { }) It("podman attach to non-running container", func() { - SkipIfRemote() session := podmanTest.Podman([]string{"create", "--name", "test1", "-d", "-i", ALPINE, "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -51,8 +50,8 @@ var _ = Describe("Podman attach", func() { }) It("podman container attach to non-running container", func() { - SkipIfRemote() session := podmanTest.Podman([]string{"container", "create", "--name", "test1", "-d", "-i", ALPINE, "ls"}) + session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -87,7 +86,6 @@ var _ = Describe("Podman attach", func() { Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1)) }) It("podman attach to the latest container", func() { - SkipIfRemote() session := podmanTest.Podman([]string{"run", "-d", "--name", "test1", ALPINE, "/bin/sh", "-c", "while true; do echo test1; sleep 1; done"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -96,7 +94,11 @@ var _ = Describe("Podman attach", func() { session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - results := podmanTest.Podman([]string{"attach", "-l"}) + cid := "-l" + if IsRemote() { + cid = "test2" + } + results := podmanTest.Podman([]string{"attach", cid}) time.Sleep(2 * time.Second) results.Signal(syscall.SIGTSTP) Expect(results.OutputToString()).To(ContainSubstring("test2")) |