Fix podman-remote start tests

Also enable some tests for remote by removing -l flag.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

2 files changed, 8 insertions, 9 deletions

diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index d02c54e76..a031b740e 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -357,7 +357,11 @@ func startAndAttach(ic *ContainerEngine, name string, detachKeys *string, input,
 func (ic *ContainerEngine) ContainerStart(ctx context.Context, namesOrIds []string, options entities.ContainerStartOptions) ([]*entities.ContainerStartReport, error) {
 	var reports []*entities.ContainerStartReport
 	for _, name := range namesOrIds {
-		report := entities.ContainerStartReport{Id: name}
+		report := entities.ContainerStartReport{
+			Id:       name,
+			RawInput: name,
+			ExitCode: 125,
+		}
 		if options.Attach {
 			report.Err = startAndAttach(ic, name, &options.DetachKeys, options.Stdin, options.Stdout, options.Stderr)
 			if report.Err == nil {
diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go
index a7a9e7fdb..b8198a3a9 100644
--- a/test/e2e/start_test.go
+++ b/test/e2e/start_test.go
@@ -40,7 +40,6 @@ var _ = Describe("Podman start", func() {
 	})
 
 	It("podman start single container by id", func() {
-		Skip(v2remotefail)
 		session := podmanTest.Podman([]string{"create", "-d", ALPINE, "ls"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
@@ -51,7 +50,6 @@ var _ = Describe("Podman start", func() {
 	})
 
 	It("podman container start single container by id", func() {
-		Skip(v2remotefail)
 		session := podmanTest.Podman([]string{"container", "create", "-d", ALPINE, "ls"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
@@ -63,7 +61,6 @@ var _ = Describe("Podman start", func() {
 	})
 
 	It("podman container start single container by short id", func() {
-		Skip(v2remotefail)
 		session := podmanTest.Podman([]string{"container", "create", "-d", ALPINE, "ls"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
@@ -123,12 +120,11 @@ var _ = Describe("Podman start", func() {
 	})
 
 	It("podman failed to start with --rm should delete the container", func() {
-		SkipIfRemote()
-		session := podmanTest.Podman([]string{"create", "-it", "--rm", ALPINE, "foo"})
+		session := podmanTest.Podman([]string{"create", "--name", "test1", "-it", "--rm", ALPINE, "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session.ExitCode()).To(Equal(0))
 
-		start := podmanTest.Podman([]string{"start", "-l"})
+		start := podmanTest.Podman([]string{"start", "test1"})
 		start.WaitWithDefaultTimeout()
 		Expect(start).To(ExitWithError())
 
@@ -136,12 +132,11 @@ var _ = Describe("Podman start", func() {
 	})
 
 	It("podman failed to start without --rm should NOT delete the container", func() {
-		SkipIfRemote()
 		session := podmanTest.Podman([]string{"create", "-it", ALPINE, "foo"})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 
-		start := podmanTest.Podman([]string{"start", "-l"})
+		start := podmanTest.Podman([]string{"start", session.OutputToString()})
 		start.WaitWithDefaultTimeout()
 		Expect(start).To(ExitWithError())