From 55e630e7876557ebd2a44e81fa357aab9efbb793 Mon Sep 17 00:00:00 2001 From: baude Date: Mon, 15 Apr 2019 09:03:18 -0500 Subject: podman-remote pause|unpause Add the ability to pause and unpause containers with the remote client. Also turned on the pause tests! Signed-off-by: baude --- test/e2e/common_test.go | 168 ++++++++++++++++++++++++++++- test/e2e/libpod_suite_remoteclient_test.go | 109 ++----------------- test/e2e/libpod_suite_test.go | 168 +---------------------------- test/e2e/pause_test.go | 3 - test/utils/utils.go | 6 ++ 5 files changed, 184 insertions(+), 270 deletions(-) (limited to 'test') diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 58f94f27e..a30a9b20b 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -11,14 +11,16 @@ import ( "strings" "testing" - "github.com/containers/libpod/pkg/rootless" - "github.com/containers/storage" - + "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/inspect" + "github.com/containers/libpod/pkg/rootless" . "github.com/containers/libpod/test/utils" + "github.com/containers/storage" "github.com/containers/storage/pkg/reexec" + "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" + "github.com/onsi/gomega/gexec" ) var ( @@ -262,6 +264,10 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration { } if remote { p.PodmanTest.RemotePodmanBinary = podmanRemoteBinary + if !rootless.IsRootless() { + uuid := stringid.GenerateNonCryptoID() + p.VarlinkEndpoint = fmt.Sprintf("unix:/run/podman/io.podman-%s", uuid) + } } // Setup registries.conf ENV variable @@ -337,3 +343,159 @@ func GetPortLock(port string) storage.Locker { lock.Lock() return lock } + +// RunTopContainer runs a simple container in the background that +// runs top. If the name passed != "", it will have a name +func (p *PodmanTestIntegration) RunTopContainer(name string) *PodmanSessionIntegration { + var podmanArgs = []string{"run"} + if name != "" { + podmanArgs = append(podmanArgs, "--name", name) + } + podmanArgs = append(podmanArgs, "-d", ALPINE, "top") + return p.Podman(podmanArgs) +} + +// RunLsContainer runs a simple container in the background that +// simply runs ls. If the name passed != "", it will have a name +func (p *PodmanTestIntegration) RunLsContainer(name string) (*PodmanSessionIntegration, int, string) { + var podmanArgs = []string{"run"} + if name != "" { + podmanArgs = append(podmanArgs, "--name", name) + } + podmanArgs = append(podmanArgs, "-d", ALPINE, "ls") + session := p.Podman(podmanArgs) + session.WaitWithDefaultTimeout() + return session, session.ExitCode(), session.OutputToString() +} + +func (p *PodmanTestIntegration) RunLsContainerInPod(name, pod string) (*PodmanSessionIntegration, int, string) { + var podmanArgs = []string{"run", "--pod", pod} + if name != "" { + podmanArgs = append(podmanArgs, "--name", name) + } + podmanArgs = append(podmanArgs, "-d", ALPINE, "ls") + session := p.Podman(podmanArgs) + session.WaitWithDefaultTimeout() + return session, session.ExitCode(), session.OutputToString() +} + +// BuildImage uses podman build and buildah to build an image +// called imageName based on a string dockerfile +func (p *PodmanTestIntegration) BuildImage(dockerfile, imageName string, layers string) { + dockerfilePath := filepath.Join(p.TempDir, "Dockerfile") + err := ioutil.WriteFile(dockerfilePath, []byte(dockerfile), 0755) + Expect(err).To(BeNil()) + session := p.Podman([]string{"build", "--layers=" + layers, "-t", imageName, "--file", dockerfilePath, p.TempDir}) + session.Wait(120) + Expect(session.ExitCode()).To(Equal(0)) +} + +// PodmanPID execs podman and returns its PID +func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegration, int) { + podmanOptions := p.MakeOptions(args) + fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " ")) + command := exec.Command(p.PodmanBinary, podmanOptions...) + session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter) + if err != nil { + Fail(fmt.Sprintf("unable to run podman command: %s", strings.Join(podmanOptions, " "))) + } + podmanSession := &PodmanSession{session} + return &PodmanSessionIntegration{podmanSession}, command.Process.Pid +} + +// Cleanup cleans up the temporary store +func (p *PodmanTestIntegration) Cleanup() { + // Remove all containers + stopall := p.Podman([]string{"stop", "-a", "--timeout", "0"}) + // stopall.WaitWithDefaultTimeout() + stopall.Wait(90) + + session := p.Podman([]string{"rm", "-fa"}) + session.Wait(90) + + p.StopVarlink() + // Nuke tempdir + if err := os.RemoveAll(p.TempDir); err != nil { + fmt.Printf("%q\n", err) + } + + // Clean up the registries configuration file ENV variable set in Create + resetRegistriesConfigEnv() +} + +// CleanupPod cleans up the temporary store +func (p *PodmanTestIntegration) CleanupPod() { + // Remove all containers + session := p.Podman([]string{"pod", "rm", "-fa"}) + session.Wait(90) + // Nuke tempdir + if err := os.RemoveAll(p.TempDir); err != nil { + fmt.Printf("%q\n", err) + } +} + +// CleanupVolume cleans up the temporary store +func (p *PodmanTestIntegration) CleanupVolume() { + // Remove all containers + session := p.Podman([]string{"volume", "rm", "-fa"}) + session.Wait(90) + // Nuke tempdir + if err := os.RemoveAll(p.TempDir); err != nil { + fmt.Printf("%q\n", err) + } +} + +// PullImages pulls multiple images +func (p *PodmanTestIntegration) PullImages(images []string) error { + for _, i := range images { + p.PullImage(i) + } + return nil +} + +// PullImage pulls a single image +// TODO should the timeout be configurable? +func (p *PodmanTestIntegration) PullImage(image string) error { + session := p.Podman([]string{"pull", image}) + session.Wait(60) + Expect(session.ExitCode()).To(Equal(0)) + return nil +} + +// InspectContainerToJSON takes the session output of an inspect +// container and returns json +func (s *PodmanSessionIntegration) InspectContainerToJSON() []inspect.ContainerData { + var i []inspect.ContainerData + err := json.Unmarshal(s.Out.Contents(), &i) + Expect(err).To(BeNil()) + return i +} + +// InspectPodToJSON takes the sessions output from a pod inspect and returns json +func (s *PodmanSessionIntegration) InspectPodToJSON() libpod.PodInspect { + var i libpod.PodInspect + err := json.Unmarshal(s.Out.Contents(), &i) + Expect(err).To(BeNil()) + return i +} + +// CreatePod creates a pod with no infra container +// it optionally takes a pod name +func (p *PodmanTestIntegration) CreatePod(name string) (*PodmanSessionIntegration, int, string) { + var podmanArgs = []string{"pod", "create", "--infra=false", "--share", ""} + if name != "" { + podmanArgs = append(podmanArgs, "--name", name) + } + session := p.Podman(podmanArgs) + session.WaitWithDefaultTimeout() + return session, session.ExitCode(), session.OutputToString() +} + +func (p *PodmanTestIntegration) RunTopContainerInPod(name, pod string) *PodmanSessionIntegration { + var podmanArgs = []string{"run", "--pod", pod} + if name != "" { + podmanArgs = append(podmanArgs, "--name", name) + } + podmanArgs = append(podmanArgs, "-d", ALPINE, "top") + return p.Podman(podmanArgs) +} diff --git a/test/e2e/libpod_suite_remoteclient_test.go b/test/e2e/libpod_suite_remoteclient_test.go index a85d21a48..1e477fe2f 100644 --- a/test/e2e/libpod_suite_remoteclient_test.go +++ b/test/e2e/libpod_suite_remoteclient_test.go @@ -4,14 +4,14 @@ package integration import ( "fmt" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/inspect" - "github.com/onsi/ginkgo" + "github.com/containers/libpod/pkg/rootless" "io/ioutil" "os" "os/exec" "path/filepath" "strings" + + "github.com/onsi/ginkgo" ) func SkipIfRemote() { @@ -24,48 +24,12 @@ func SkipIfRootless() { } } -// Cleanup cleans up the temporary store -func (p *PodmanTestIntegration) Cleanup() { - p.StopVarlink() - // TODO - // Stop all containers - // Rm all containers - - if err := os.RemoveAll(p.TempDir); err != nil { - fmt.Printf("%q\n", err) - } - - // Clean up the registries configuration file ENV variable set in Create - resetRegistriesConfigEnv() -} - // Podman is the exec call to podman on the filesystem func (p *PodmanTestIntegration) Podman(args []string) *PodmanSessionIntegration { podmanSession := p.PodmanBase(args) return &PodmanSessionIntegration{podmanSession} } -//RunTopContainer runs a simple container in the background that -// runs top. If the name passed != "", it will have a name -func (p *PodmanTestIntegration) RunTopContainer(name string) *PodmanSessionIntegration { - // TODO - return nil -} - -//RunLsContainer runs a simple container in the background that -// simply runs ls. If the name passed != "", it will have a name -func (p *PodmanTestIntegration) RunLsContainer(name string) (*PodmanSessionIntegration, int, string) { - // TODO - return nil, 0, "" -} - -// InspectImageJSON takes the session output of an inspect -// image and returns json -//func (s *PodmanSessionIntegration) InspectImageJSON() []inspect.ImageData { -// // TODO -// return nil -//} - func (p *PodmanTestIntegration) setDefaultRegistriesConfigEnv() { defaultFile := filepath.Join(INTEGRATION_ROOT, "test/registries.conf") os.Setenv("REGISTRIES_CONFIG_PATH", defaultFile) @@ -80,64 +44,6 @@ func (p *PodmanTestIntegration) setRegistriesConfigEnv(b []byte) { func resetRegistriesConfigEnv() { os.Setenv("REGISTRIES_CONFIG_PATH", "") } - -// InspectContainerToJSON takes the session output of an inspect -// container and returns json -func (s *PodmanSessionIntegration) InspectContainerToJSON() []inspect.ContainerData { - // TODO - return nil -} - -// CreatePod creates a pod with no infra container -// it optionally takes a pod name -func (p *PodmanTestIntegration) CreatePod(name string) (*PodmanSessionIntegration, int, string) { - // TODO - return nil, 0, "" -} - -func (p *PodmanTestIntegration) RunTopContainerInPod(name, pod string) *PodmanSessionIntegration { - // TODO - return nil -} - -// BuildImage uses podman build and buildah to build an image -// called imageName based on a string dockerfile -func (p *PodmanTestIntegration) BuildImage(dockerfile, imageName string, layers string) { - // TODO -} - -// CleanupPod cleans up the temporary store -func (p *PodmanTestIntegration) CleanupPod() { - // TODO -} - -// InspectPodToJSON takes the sessions output from a pod inspect and returns json -func (s *PodmanSessionIntegration) InspectPodToJSON() libpod.PodInspect { - // TODO - return libpod.PodInspect{} -} -func (p *PodmanTestIntegration) RunLsContainerInPod(name, pod string) (*PodmanSessionIntegration, int, string) { - // TODO - return nil, 0, "" -} - -// PullImages pulls multiple images -func (p *PodmanTestIntegration) PullImages(images []string) error { - // TODO - return libpod.ErrNotImplemented -} - -// PodmanPID execs podman and returns its PID -func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegration, int) { - // TODO - return nil, 0 -} - -// CleanupVolume cleans up the temporary store -func (p *PodmanTestIntegration) CleanupVolume() { - // TODO -} - func PodmanTestCreate(tempDir string) *PodmanTestIntegration { pti := PodmanTestCreateUtil(tempDir, true) pti.StartVarlink() @@ -148,7 +54,7 @@ func (p *PodmanTestIntegration) StartVarlink() { if os.Geteuid() == 0 { os.MkdirAll("/run/podman", 0755) } - varlinkEndpoint := "unix:/run/podman/io.podman" + varlinkEndpoint := p.VarlinkEndpoint if addr := os.Getenv("PODMAN_VARLINK_ADDRESS"); addr != "" { varlinkEndpoint = addr } @@ -165,6 +71,13 @@ func (p *PodmanTestIntegration) StopVarlink() { varlinkSession := p.VarlinkSession varlinkSession.Kill() varlinkSession.Wait() + + if !rootless.IsRootless() { + socket := strings.Split(p.VarlinkEndpoint, ":")[1] + if err := os.Remove(socket); err != nil { + fmt.Println(err) + } + } } //MakeOptions assembles all the podman main options diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index a69c1ba9a..867844c32 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -3,27 +3,17 @@ package integration import ( - "encoding/json" "fmt" "io/ioutil" "os" - "os/exec" "path/filepath" "strings" - "github.com/containers/libpod/libpod" - "github.com/containers/libpod/pkg/inspect" - . "github.com/containers/libpod/test/utils" "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - "github.com/onsi/gomega/gexec" ) func SkipIfRemote() { - if os.Geteuid() != 0 { - ginkgo.Skip("This function is not enabled for rootless podman") - } + ginkgo.Skip("This function is not enabled for remote podman") } func SkipIfRootless() { @@ -44,161 +34,6 @@ func (p *PodmanTestIntegration) PodmanAsUser(args []string, uid, gid uint32, cwd return &PodmanSessionIntegration{podmanSession} } -// PodmanPID execs podman and returns its PID -func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegration, int) { - podmanOptions := p.MakeOptions(args) - fmt.Printf("Running: %s %s\n", p.PodmanBinary, strings.Join(podmanOptions, " ")) - command := exec.Command(p.PodmanBinary, podmanOptions...) - session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter) - if err != nil { - Fail(fmt.Sprintf("unable to run podman command: %s", strings.Join(podmanOptions, " "))) - } - podmanSession := &PodmanSession{session} - return &PodmanSessionIntegration{podmanSession}, command.Process.Pid -} - -// Cleanup cleans up the temporary store -func (p *PodmanTestIntegration) Cleanup() { - // Remove all containers - stopall := p.Podman([]string{"stop", "-a", "--timeout", "0"}) - // stopall.WaitWithDefaultTimeout() - stopall.Wait(90) - - session := p.Podman([]string{"rm", "-fa"}) - session.Wait(90) - - // Nuke tempdir - if err := os.RemoveAll(p.TempDir); err != nil { - fmt.Printf("%q\n", err) - } - - // Clean up the registries configuration file ENV variable set in Create - resetRegistriesConfigEnv() -} - -// CleanupPod cleans up the temporary store -func (p *PodmanTestIntegration) CleanupPod() { - // Remove all containers - session := p.Podman([]string{"pod", "rm", "-fa"}) - session.Wait(90) - // Nuke tempdir - if err := os.RemoveAll(p.TempDir); err != nil { - fmt.Printf("%q\n", err) - } -} - -// CleanupVolume cleans up the temporary store -func (p *PodmanTestIntegration) CleanupVolume() { - // Remove all containers - session := p.Podman([]string{"volume", "rm", "-fa"}) - session.Wait(90) - // Nuke tempdir - if err := os.RemoveAll(p.TempDir); err != nil { - fmt.Printf("%q\n", err) - } -} - -// PullImages pulls multiple images -func (p *PodmanTestIntegration) PullImages(images []string) error { - for _, i := range images { - p.PullImage(i) - } - return nil -} - -// PullImage pulls a single image -// TODO should the timeout be configurable? -func (p *PodmanTestIntegration) PullImage(image string) error { - session := p.Podman([]string{"pull", image}) - session.Wait(60) - Expect(session.ExitCode()).To(Equal(0)) - return nil -} - -// InspectContainerToJSON takes the session output of an inspect -// container and returns json -func (s *PodmanSessionIntegration) InspectContainerToJSON() []inspect.ContainerData { - var i []inspect.ContainerData - err := json.Unmarshal(s.Out.Contents(), &i) - Expect(err).To(BeNil()) - return i -} - -// InspectPodToJSON takes the sessions output from a pod inspect and returns json -func (s *PodmanSessionIntegration) InspectPodToJSON() libpod.PodInspect { - var i libpod.PodInspect - err := json.Unmarshal(s.Out.Contents(), &i) - Expect(err).To(BeNil()) - return i -} - -// CreatePod creates a pod with no infra container -// it optionally takes a pod name -func (p *PodmanTestIntegration) CreatePod(name string) (*PodmanSessionIntegration, int, string) { - var podmanArgs = []string{"pod", "create", "--infra=false", "--share", ""} - if name != "" { - podmanArgs = append(podmanArgs, "--name", name) - } - session := p.Podman(podmanArgs) - session.WaitWithDefaultTimeout() - return session, session.ExitCode(), session.OutputToString() -} - -// RunTopContainer runs a simple container in the background that -// runs top. If the name passed != "", it will have a name -func (p *PodmanTestIntegration) RunTopContainer(name string) *PodmanSessionIntegration { - var podmanArgs = []string{"run"} - if name != "" { - podmanArgs = append(podmanArgs, "--name", name) - } - podmanArgs = append(podmanArgs, "-d", ALPINE, "top") - return p.Podman(podmanArgs) -} - -func (p *PodmanTestIntegration) RunTopContainerInPod(name, pod string) *PodmanSessionIntegration { - var podmanArgs = []string{"run", "--pod", pod} - if name != "" { - podmanArgs = append(podmanArgs, "--name", name) - } - podmanArgs = append(podmanArgs, "-d", ALPINE, "top") - return p.Podman(podmanArgs) -} - -// RunLsContainer runs a simple container in the background that -// simply runs ls. If the name passed != "", it will have a name -func (p *PodmanTestIntegration) RunLsContainer(name string) (*PodmanSessionIntegration, int, string) { - var podmanArgs = []string{"run"} - if name != "" { - podmanArgs = append(podmanArgs, "--name", name) - } - podmanArgs = append(podmanArgs, "-d", ALPINE, "ls") - session := p.Podman(podmanArgs) - session.WaitWithDefaultTimeout() - return session, session.ExitCode(), session.OutputToString() -} - -func (p *PodmanTestIntegration) RunLsContainerInPod(name, pod string) (*PodmanSessionIntegration, int, string) { - var podmanArgs = []string{"run", "--pod", pod} - if name != "" { - podmanArgs = append(podmanArgs, "--name", name) - } - podmanArgs = append(podmanArgs, "-d", ALPINE, "ls") - session := p.Podman(podmanArgs) - session.WaitWithDefaultTimeout() - return session, session.ExitCode(), session.OutputToString() -} - -// BuildImage uses podman build and buildah to build an image -// called imageName based on a string dockerfile -func (p *PodmanTestIntegration) BuildImage(dockerfile, imageName string, layers string) { - dockerfilePath := filepath.Join(p.TempDir, "Dockerfile") - err := ioutil.WriteFile(dockerfilePath, []byte(dockerfile), 0755) - Expect(err).To(BeNil()) - session := p.Podman([]string{"build", "--layers=" + layers, "-t", imageName, "--file", dockerfilePath, p.TempDir}) - session.Wait(120) - Expect(session.ExitCode()).To(Equal(0)) -} - func (p *PodmanTestIntegration) setDefaultRegistriesConfigEnv() { defaultFile := filepath.Join(INTEGRATION_ROOT, "test/registries.conf") os.Setenv("REGISTRIES_CONFIG_PATH", defaultFile) @@ -245,3 +80,4 @@ func (p *PodmanTestIntegration) RestoreArtifact(image string) error { restore.Wait(90) return nil } +func (p *PodmanTestIntegration) StopVarlink() {} diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index e28c31c3a..c47189a0e 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -1,5 +1,3 @@ -// +build !remoteclient - package integration import ( @@ -70,7 +68,6 @@ var _ = Describe("Podman pause", func() { session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) cid := session.OutputToString() - result := podmanTest.Podman([]string{"pause", cid}) result.WaitWithDefaultTimeout() diff --git a/test/utils/utils.go b/test/utils/utils.go index 6308197b8..1e0391d2e 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -4,6 +4,7 @@ import ( "bufio" "encoding/json" "fmt" + "github.com/containers/libpod/pkg/rootless" "io/ioutil" "os" "os/exec" @@ -40,6 +41,7 @@ type PodmanTest struct { RemoteTest bool RemotePodmanBinary string VarlinkSession *os.Process + VarlinkEndpoint string } // PodmanSession wraps the gexec.session so we can extend it @@ -67,7 +69,11 @@ func (p *PodmanTest) PodmanAsUserBase(args []string, uid, gid uint32, cwd string podmanBinary := p.PodmanBinary if p.RemoteTest { podmanBinary = p.RemotePodmanBinary + if !rootless.IsRootless() { + env = append(env, fmt.Sprintf("PODMAN_VARLINK_ADDRESS=%s", p.VarlinkEndpoint)) + } } + if env == nil { fmt.Printf("Running: %s %s\n", podmanBinary, strings.Join(podmanOptions, " ")) } else { -- cgit v1.2.3-54-g00ecf