V2 Restore exists E2E tests

* Fix setting exit code in */exists.go

Signed-off-by: Jhon Honce <jhonce@redhat.com>

cmd/podman/containers/exists.go

@@ -2,7 +2,6 @@ package containers
 
 import (
 	"context"
-	"os"
 
 	"github.com/containers/libpod/cmd/podman/registry"
 	"github.com/containers/libpod/pkg/domain/entities"
@@ -37,7 +36,7 @@ func exists(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	if !response.Value {
-		os.Exit(1)
+		registry.SetExitCode(1)
 	}
 	return nil
 }

cmd/podman/images/exists.go

@@ -1,8 +1,6 @@
 package images
 
 import (
-	"os"
-
 	"github.com/containers/libpod/cmd/podman/registry"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/spf13/cobra"
@@ -34,7 +32,7 @@ func exists(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	if !found.Value {
-		os.Exit(1)
+		registry.SetExitCode(1)
 	}
 	return nil
 }

cmd/podman/pods/create.go

@@ -69,10 +69,24 @@ func create(cmd *cobra.Command, args []string) error {
 		return errors.Wrapf(err, "unable to process labels")
 	}
 
-	if !createOptions.Infra && cmd.Flag("share").Changed && share != "none" && share != "" {
+	if !createOptions.Infra {
-		return errors.Errorf("You cannot share kernel namespaces on the pod level without an infra container")
+		if cmd.Flag("infra-command").Changed {
+			return errors.New("cannot set infra-command without an infra container")
+		}
+		createOptions.InfraCommand = ""
+		if cmd.Flag("infra-image").Changed {
+			return errors.New("cannot set infra-image without an infra container")
+		}
+		createOptions.InfraImage = ""
+
+		if cmd.Flag("share").Changed && share != "none" && share != "" {
+			return fmt.Errorf("cannot set share(%s) namespaces without an infra container", cmd.Flag("share").Value)
+		}
+		createOptions.Share = nil
+	} else {
+		createOptions.Share = strings.Split(share, ",")
 	}
-	createOptions.Share = strings.Split(share, ",")
+
 	if cmd.Flag("pod-id-file").Changed {
 		podIdFile, err = util.OpenExclusiveFile(podIDFile)
 		if err != nil && os.IsExist(err) {
@@ -122,21 +136,6 @@ func create(cmd *cobra.Command, args []string) error {
 		}
 	}
 
-	if !createOptions.Infra {
-		if cmd.Flag("infra-command").Changed {
-			return errors.New("cannot set infra-command without an infra container")
-		}
-		createOptions.InfraCommand = ""
-		if cmd.Flag("infra-image").Changed {
-			return errors.New("cannot set infra-image without an infra container")
-		}
-		createOptions.InfraImage = ""
-		if cmd.Flag("share").Changed {
-			return errors.New("cannot set share namespaces without an infra container")
-		}
-		createOptions.Share = nil
-	}
-
 	response, err := registry.ContainerEngine().PodCreate(context.Background(), createOptions)
 	if err != nil {
 		return err

cmd/podman/pods/exists.go

@@ -2,7 +2,6 @@ package pods
 
 import (
 	"context"
-	"os"
 
 	"github.com/containers/libpod/cmd/podman/registry"
 	"github.com/containers/libpod/pkg/domain/entities"
@@ -37,7 +36,7 @@ func exists(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	if !response.Value {
-		os.Exit(1)
+		registry.SetExitCode(1)
 	}
 	return nil
 }

test/e2e/exists_test.go

@@ -6,6 +6,7 @@ import (
 	. "github.com/containers/libpod/test/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega/gexec"
 )
 
 var _ = Describe("Podman image|container exists", func() {
@@ -16,7 +17,6 @@ var _ = Describe("Podman image|container exists", func() {
 	)
 
 	BeforeEach(func() {
-		Skip(v2fail)
 		tempdir, err = CreateTempDirInTempDir()
 		if err != nil {
 			os.Exit(1)
@@ -36,17 +36,17 @@ var _ = Describe("Podman image|container exists", func() {
 	It("podman image exists in local storage by fq name", func() {
 		session := podmanTest.Podman([]string{"image", "exists", ALPINE})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session).Should(Exit(0))
 	})
 	It("podman image exists in local storage by short name", func() {
 		session := podmanTest.Podman([]string{"image", "exists", "alpine"})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session).Should(Exit(0))
 	})
 	It("podman image does not exist in local storage", func() {
 		session := podmanTest.Podman([]string{"image", "exists", "alpine9999"})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(1))
+		Expect(session).Should(Exit(1))
 	})
 	It("podman container exists in local storage by name", func() {
 		setup := podmanTest.RunTopContainer("foobar")
@@ -55,17 +55,17 @@ var _ = Describe("Podman image|container exists", func() {
 
 		session := podmanTest.Podman([]string{"container", "exists", "foobar"})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session).Should(Exit(0))
 	})
 	It("podman container exists in local storage by container ID", func() {
 		setup := podmanTest.RunTopContainer("")
 		setup.WaitWithDefaultTimeout()
-		Expect(setup.ExitCode()).To(Equal(0))
+		Expect(setup).Should(Exit(0))
 		cid := setup.OutputToString()
 
 		session := podmanTest.Podman([]string{"container", "exists", cid})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session).Should(Exit(0))
 	})
 	It("podman container exists in local storage by short container ID", func() {
 		setup := podmanTest.RunTopContainer("")
@@ -75,46 +75,46 @@ var _ = Describe("Podman image|container exists", func() {
 
 		session := podmanTest.Podman([]string{"container", "exists", cid})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session).Should(Exit(0))
 	})
 	It("podman container does not exist in local storage", func() {
 		session := podmanTest.Podman([]string{"container", "exists", "foobar"})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(1))
+		Expect(session).Should(Exit(1))
 	})
 
 	It("podman pod exists in local storage by name", func() {
-		setup, rc, _ := podmanTest.CreatePod("foobar")
+		setup, _, _ := podmanTest.CreatePod("foobar")
 		setup.WaitWithDefaultTimeout()
-		Expect(rc).To(Equal(0))
+		Expect(setup).Should(Exit(0))
 
 		session := podmanTest.Podman([]string{"pod", "exists", "foobar"})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session).Should(Exit(0))
 	})
 	It("podman pod exists in local storage by container ID", func() {
-		setup, rc, podID := podmanTest.CreatePod("")
+		setup, _, podID := podmanTest.CreatePod("")
 		setup.WaitWithDefaultTimeout()
-		Expect(rc).To(Equal(0))
+		Expect(setup).Should(Exit(0))
 
 		session := podmanTest.Podman([]string{"pod", "exists", podID})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session).Should(Exit(0))
 	})
 	It("podman pod exists in local storage by short container ID", func() {
-		setup, rc, podID := podmanTest.CreatePod("")
+		setup, _, podID := podmanTest.CreatePod("")
 		setup.WaitWithDefaultTimeout()
-		Expect(rc).To(Equal(0))
+		Expect(setup).Should(Exit(0))
 
 		session := podmanTest.Podman([]string{"pod", "exists", podID[0:12]})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(0))
+		Expect(session).Should(Exit(0))
 	})
 	It("podman pod does not exist in local storage", func() {
 		// The exit code for non-existing pod is incorrect (125 vs 1)
 		SkipIfRemote()
 		session := podmanTest.Podman([]string{"pod", "exists", "foobar"})
 		session.WaitWithDefaultTimeout()
-		Expect(session.ExitCode()).To(Equal(1))
+		Expect(session).Should(Exit(1))
 	})
 })