Define, and use, PodmanExitCleanlyWithOptions

This is a generalization of PodmanExitCleanly, scalable to an arbitrary number of possible options. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
containers · Jan 22, 2025 · 5fc2200 · 5fc2200
1 parent 91fc5ea
commit 5fc2200
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
@@ -492,7 +492,14 @@ func (s *PodmanSessionIntegration) InspectImageJSON() []inspect.ImageData {
 // It returns the session (to allow consuming output if desired).
 func (p *PodmanTestIntegration) PodmanExitCleanly(args ...string) *PodmanSessionIntegration {
 	GinkgoHelper()
-	session := p.Podman(args)
+	return p.PodmanExitCleanlyWithOptions(PodmanExecOptions{}, args...)
+}
+
+// PodmanExicCleanlyWithOptions runs a podman command with (optinos, args), and expects it to ExitCleanly within the default timeout.
+// It returns the session (to allow consuming output if desired).
+func (p *PodmanTestIntegration) PodmanExitCleanlyWithOptions(options PodmanExecOptions, args ...string) *PodmanSessionIntegration {
+	GinkgoHelper()
+	session := p.PodmanWithOptions(options, args...)
 	session.WaitWithDefaultTimeout()
 	Expect(session).Should(ExitCleanly())
 	return session

diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go
@@ -457,11 +457,9 @@ var _ = Describe("Podman exec", func() {
 		files := []*os.File{
 			devNull,
 		}
-		session := podmanTest.PodmanWithOptions(PodmanExecOptions{
+		podmanTest.PodmanExitCleanlyWithOptions(PodmanExecOptions{
 			ExtraFiles: files,
 		}, "exec", "--preserve-fds", "1", "test1", "ls")
-		session.WaitWithDefaultTimeout()
-		Expect(session).Should(ExitCleanly())
 	})
 
 	It("podman exec preserves --group-add groups", func() {

diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
@@ -1710,18 +1710,16 @@ VOLUME %s`, ALPINE, volPath, volPath)
 		if isRootless() {
 			scopeOptions.Wrapper = append(scopeOptions.Wrapper, "--user")
 		}
-		container := podmanTest.PodmanWithOptions(scopeOptions, "run", "--rm", "--cgroups=split", ALPINE, "cat", "/proc/self/cgroup")
-		container.WaitWithDefaultTimeout()
-		Expect(container).Should(Exit(0))
+		container := podmanTest.PodmanExitCleanlyWithOptions(scopeOptions,
+			"run", "--rm", "--cgroups=split", ALPINE, "cat", "/proc/self/cgroup")
 		checkLines(container.OutputToStringArray())
 		Expect(container.ErrorToString()).To(Or(
 			ContainSubstring("Running scope as unit: "), // systemd <  255
 			ContainSubstring("Running as unit: ")))      // systemd >= 255
 
 		// check that --cgroups=split is honored also when a container runs in a pod
-		container = podmanTest.PodmanWithOptions(scopeOptions, "run", "--rm", "--pod", "new:split-test-pod", "--cgroups=split", ALPINE, "cat", "/proc/self/cgroup")
-		container.WaitWithDefaultTimeout()
-		Expect(container).Should(Exit(0))
+		container = podmanTest.PodmanExitCleanlyWithOptions(scopeOptions,
+			"run", "--rm", "--pod", "new:split-test-pod", "--cgroups=split", ALPINE, "cat", "/proc/self/cgroup")
 		checkLines(container.OutputToStringArray())
 		Expect(container.ErrorToString()).To(Or(
 			ContainSubstring("Running scope as unit: "), // systemd <  255