From ab29ff2f66216cfafa01add2c3238831a3824317 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Thu, 11 May 2023 18:59:13 +0200 Subject: [PATCH] test/e2e: dedup Before/AfterEach nodes There is no reason to define the same code every time in each file, just use global nodes. This diff should speak for itself. CleanupSecrets()/Volume() no longer call Cleanup() directly, as the global AfterEach node will always call Cleanup() this is no longer necessary. If one AfterEach() node fails it will still run the others. Also always unset the CONTAINERS_CONF env vars. This prevents people from forgetting to unset it. And fix the special CONTAINERS_CONF logic in the system connection tests, we do not want to preserve CONTAINERS_CONF anyway so just remove this logic. Ginkgo orders the BeforeEach and AfterEach nodes. They will be executed from the outer-most defined to inner-most. This means our global BeforeEach is always first. Only then the inner one (in the Describe() function in each file). For AfterEach it is inverted, from the inner to the outer. Also see https://onsi.github.io/ginkgo/#organizing-specs-with-container-nodes Signed-off-by: Paul Holzinger --- test/e2e/attach_test.go | 19 ---------- test/e2e/build_test.go | 22 ------------ test/e2e/checkpoint_image_test.go | 18 ---------- test/e2e/checkpoint_test.go | 16 --------- test/e2e/cleanup_test.go | 21 ----------- test/e2e/commit_test.go | 19 ---------- test/e2e/common_test.go | 27 +++++++++++--- test/e2e/container_clone_test.go | 22 ------------ test/e2e/container_create_volume_test.go | 22 ------------ test/e2e/container_inspect_test.go | 23 ------------ test/e2e/containers_conf_test.go | 19 ---------- test/e2e/cp_test.go | 21 ----------- test/e2e/create_staticip_test.go | 22 ------------ test/e2e/create_staticmac_test.go | 24 ------------- test/e2e/create_test.go | 19 ---------- test/e2e/diff_test.go | 22 ------------ test/e2e/events_test.go | 22 ------------ test/e2e/exec_test.go | 21 ----------- test/e2e/exists_test.go | 24 ------------- test/e2e/export_test.go | 21 ----------- test/e2e/generate_kube_test.go | 21 ----------- test/e2e/generate_spec_test.go | 19 ---------- test/e2e/generate_systemd_test.go | 21 ----------- test/e2e/healthcheck_run_test.go | 21 ----------- test/e2e/history_test.go | 23 ------------ test/e2e/image_scp_test.go | 36 +------------------ test/e2e/image_sign_test.go | 17 +-------- test/e2e/images_test.go | 21 ----------- test/e2e/import_test.go | 22 ------------ test/e2e/info_test.go | 21 ----------- test/e2e/init_test.go | 24 ------------- test/e2e/inspect_test.go | 23 ------------ test/e2e/kill_test.go | 21 ----------- test/e2e/load_test.go | 19 ---------- test/e2e/login_logout_test.go | 8 ----- test/e2e/logs_test.go | 21 ----------- test/e2e/manifest_test.go | 19 ---------- test/e2e/mount_rootless_test.go | 20 ----------- test/e2e/mount_test.go | 20 ----------- test/e2e/negative_test.go | 22 ------------ test/e2e/network_connect_disconnect_test.go | 23 ------------ test/e2e/network_create_test.go | 21 ----------- test/e2e/network_test.go | 22 ------------ test/e2e/pause_test.go | 19 ---------- test/e2e/play_build_test.go | 21 ----------- test/e2e/play_kube_test.go | 22 +----------- test/e2e/pod_clone_test.go | 22 ++---------- test/e2e/pod_create_test.go | 24 +------------ test/e2e/pod_infra_container_test.go | 22 ------------ test/e2e/pod_initcontainers_test.go | 22 ------------ test/e2e/pod_inspect_test.go | 22 ------------ test/e2e/pod_kill_test.go | 23 ------------ test/e2e/pod_pause_test.go | 21 ----------- test/e2e/pod_pod_namespaces_test.go | 24 ------------- test/e2e/pod_prune_test.go | 24 ------------- test/e2e/pod_ps_test.go | 22 ------------ test/e2e/pod_restart_test.go | 24 ------------- test/e2e/pod_rm_test.go | 21 ----------- test/e2e/pod_start_test.go | 21 ----------- test/e2e/pod_stats_test.go | 20 ----------- test/e2e/pod_stop_test.go | 22 ------------ test/e2e/pod_top_test.go | 23 ------------ test/e2e/port_test.go | 22 ------------ test/e2e/prune_test.go | 22 ------------ test/e2e/ps_test.go | 22 ------------ test/e2e/pull_test.go | 21 ----------- test/e2e/push_test.go | 18 ---------- test/e2e/quadlet_test.go | 17 --------- test/e2e/rename_test.go | 22 ------------ test/e2e/restart_test.go | 21 ----------- test/e2e/rm_test.go | 22 ------------ test/e2e/rmi_test.go | 22 ------------ test/e2e/run_aardvark_test.go | 20 ----------- test/e2e/run_apparmor_test.go | 21 ----------- test/e2e/run_cgroup_parent_test.go | 18 ---------- test/e2e/run_cleanup_test.go | 25 ------------- test/e2e/run_cpu_test.go | 20 ----------- test/e2e/run_device_test.go | 21 ----------- test/e2e/run_dns_test.go | 23 ------------ test/e2e/run_entrypoint_test.go | 24 ------------- test/e2e/run_env_test.go | 22 ------------ test/e2e/run_exit_test.go | 23 ------------ test/e2e/run_memory_test.go | 21 ----------- test/e2e/run_networking_test.go | 22 +----------- test/e2e/run_ns_test.go | 22 ------------ test/e2e/run_passwd_test.go | 22 ------------ test/e2e/run_privileged_test.go | 21 ----------- test/e2e/run_restart_test.go | 23 ------------ test/e2e/run_seccomp_test.go | 23 ------------ test/e2e/run_security_labels_test.go | 22 ------------ test/e2e/run_selinux_test.go | 20 ----------- test/e2e/run_signal_test.go | 23 +----------- test/e2e/run_staticip_test.go | 19 ---------- test/e2e/run_test.go | 20 ----------- test/e2e/run_transient_test.go | 18 ---------- test/e2e/run_userns_test.go | 20 ----------- test/e2e/run_volume_test.go | 20 ----------- test/e2e/run_working_dir_test.go | 22 ------------ test/e2e/runlabel_test.go | 19 ---------- test/e2e/save_test.go | 21 ----------- test/e2e/search_test.go | 21 ----------- test/e2e/secret_test.go | 17 --------- test/e2e/start_test.go | 21 ----------- test/e2e/stats_test.go | 19 ---------- test/e2e/stop_test.go | 22 ------------ test/e2e/system_connection_test.go | 40 ++++++--------------- test/e2e/system_df_test.go | 21 ----------- test/e2e/system_dial_stdio_test.go | 23 ------------ test/e2e/system_reset_test.go | 23 ------------ test/e2e/system_service_test.go | 16 --------- test/e2e/systemd_activate_test.go | 20 +---------- test/e2e/systemd_test.go | 21 ++--------- test/e2e/tag_test.go | 21 ----------- test/e2e/toolbox_test.go | 21 ----------- test/e2e/top_test.go | 22 ------------ test/e2e/tree_test.go | 20 ----------- test/e2e/trust_test.go | 19 ---------- test/e2e/unshare_test.go | 21 ----------- test/e2e/untag_test.go | 24 ------------- test/e2e/update_test.go | 20 ----------- test/e2e/version_test.go | 22 ------------ test/e2e/volume_create_test.go | 18 ---------- test/e2e/volume_exists_test.go | 20 ----------- test/e2e/volume_inspect_test.go | 19 ---------- test/e2e/volume_ls_test.go | 18 ---------- test/e2e/volume_plugin_test.go | 15 -------- test/e2e/volume_prune_test.go | 20 ----------- test/e2e/volume_rm_test.go | 19 ---------- test/e2e/wait_test.go | 24 ------------- 129 files changed, 44 insertions(+), 2695 deletions(-) diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go index 352c4f76b9..15d99f5a8a 100644 --- a/test/e2e/attach_test.go +++ b/test/e2e/attach_test.go @@ -4,31 +4,12 @@ import ( "syscall" "time" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman attach", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - Expect(err).ToNot(HaveOccurred()) - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman attach to bogus container", func() { session := podmanTest.Podman([]string{"attach", "foobar"}) diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index 713dad1289..73d12a8dab 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -10,34 +10,12 @@ import ( "strings" "github.com/containers/buildah" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman build", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) - // Let's first do the most simple build possible to make sure stuff is // happy and then clean up after ourselves to make sure that works too. It("podman build and remove basic alpine", func() { diff --git a/test/e2e/checkpoint_image_test.go b/test/e2e/checkpoint_image_test.go index 5aad664b46..34c91b3437 100644 --- a/test/e2e/checkpoint_image_test.go +++ b/test/e2e/checkpoint_image_test.go @@ -1,7 +1,6 @@ package integration import ( - "os" "os/exec" "strconv" "strings" @@ -14,21 +13,10 @@ import ( ) var _ = Describe("Podman checkpoint", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfContainerized("FIXME: #15015. All checkpoint tests hang when containerized.") SkipIfRootless("checkpoint not supported in rootless mode") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() // Check if the runtime implements checkpointing. Currently only // runc's checkpoint/restore implementation is supported. cmd := exec.Command(podmanTest.OCIRuntime, "checkpoint", "--help") @@ -44,12 +32,6 @@ var _ = Describe("Podman checkpoint", func() { } }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) - It("podman checkpoint --create-image with bogus container", func() { checkpointImage := "foobar-checkpoint" session := podmanTest.Podman([]string{"container", "checkpoint", "--create-image", checkpointImage, "foobar"}) diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index 92483ff3bf..4fb33d9f54 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -28,20 +28,11 @@ func getRunString(input []string) []string { } var _ = Describe("Podman checkpoint", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRootless("checkpoint not supported in rootless mode") SkipIfContainerized("FIXME: #15015. All checkpoint tests hang when containerized.") - tempdir, err = CreateTempDirInTempDir() - Expect(err).ToNot(HaveOccurred()) - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() // Check if the runtime implements checkpointing. Currently only // runc's checkpoint/restore implementation is supported. cmd := exec.Command(podmanTest.OCIRuntime, "checkpoint", "--help") @@ -64,13 +55,6 @@ var _ = Describe("Podman checkpoint", func() { } }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) - It("podman checkpoint bogus container", func() { session := podmanTest.Podman([]string{"container", "checkpoint", "foobar"}) session.WaitWithDefaultTimeout() diff --git a/test/e2e/cleanup_test.go b/test/e2e/cleanup_test.go index 1563212c0d..6f2f6a533b 100644 --- a/test/e2e/cleanup_test.go +++ b/test/e2e/cleanup_test.go @@ -1,36 +1,15 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman container cleanup", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRemote("podman container cleanup is not supported in remote") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman cleanup bogus container", func() { diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index bcfeeee2c6..30e420a12b 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -12,25 +12,6 @@ import ( ) var _ = Describe("Podman commit", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - Expect(err).ToNot(HaveOccurred()) - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman commit container", func() { _, ec, _ := podmanTest.RunLsContainer("test1") diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 3b3b438410..483f68e120 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -102,6 +102,29 @@ func TestLibpod(t *testing.T) { RunSpecs(t, "Libpod Suite") } +var ( + tempdir string + err error + podmanTest *PodmanTestIntegration + + _ = BeforeEach(func() { + tempdir, err = CreateTempDirInTempDir() + Expect(err).ToNot(HaveOccurred()) + podmanTest = PodmanTestCreate(tempdir) + podmanTest.Setup() + }) + + _ = AfterEach(func() { + // First unset CONTAINERS_CONF before doing Cleanup() to prevent + // invalid containers.conf files to fail the cleanup. + os.Unsetenv("CONTAINERS_CONF") + os.Unsetenv("CONTAINERS_CONF_OVERRIDE") + podmanTest.Cleanup() + f := CurrentSpecReport() + processTestResult(f) + }) +) + var _ = SynchronizedBeforeSuite(func() []byte { // make cache dir ImageCacheDir = filepath.Join(os.TempDir(), "imagecachedir") @@ -643,8 +666,6 @@ func (p *PodmanTestIntegration) CleanupVolume() { // Remove all containers session := p.Podman([]string{"volume", "rm", "-fa"}) session.WaitWithDefaultTimeout() - - p.Cleanup() Expect(session).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", session.Command.Args, session.OutputToString(), session.ErrorToString()) } @@ -654,8 +675,6 @@ func (p *PodmanTestIntegration) CleanupSecrets() { // Remove all containers session := p.Podman([]string{"secret", "rm", "-a"}) session.Wait(90) - - p.Cleanup() Expect(session).To(Exit(0), "command: %v\nstdout: %s\nstderr: %s", session.Command.Args, session.OutputToString(), session.ErrorToString()) } diff --git a/test/e2e/container_clone_test.go b/test/e2e/container_clone_test.go index 1ae2ace615..71ec324ef8 100644 --- a/test/e2e/container_clone_test.go +++ b/test/e2e/container_clone_test.go @@ -1,36 +1,14 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman container clone", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - BeforeEach(func() { SkipIfRemote("podman container clone is not supported in remote") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman container clone basic test", func() { diff --git a/test/e2e/container_create_volume_test.go b/test/e2e/container_create_volume_test.go index 40eca72b46..f1b80299f5 100644 --- a/test/e2e/container_create_volume_test.go +++ b/test/e2e/container_create_volume_test.go @@ -5,7 +5,6 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" @@ -69,27 +68,6 @@ func checkDataVolumeContainer(pTest *PodmanTestIntegration, image, cont, dest, d } var _ = Describe("Podman create data volume", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - os.Unsetenv("CONTAINERS_CONF") - }) It("podman create with volume data copy turned off", func() { imgName, volData, volDest := "dataimg", "dummy", "/test" diff --git a/test/e2e/container_inspect_test.go b/test/e2e/container_inspect_test.go index 2af006cc02..4c7b2c84b5 100644 --- a/test/e2e/container_inspect_test.go +++ b/test/e2e/container_inspect_test.go @@ -1,37 +1,14 @@ package integration import ( - "os" - "github.com/containers/podman/v4/libpod/define" "github.com/containers/podman/v4/pkg/annotations" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman container inspect", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman inspect a container for the container manager annotation", func() { const testContainer = "container-inspect-test-1" diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index 2fa5e83632..86f3ec1ce0 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -16,19 +16,8 @@ import ( ) var _ = Describe("Verify podman containers.conf usage", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() os.Setenv("CONTAINERS_CONF", "config/containers.conf") if IsRemote() { podmanTest.RestartRemoteService() @@ -36,14 +25,6 @@ var _ = Describe("Verify podman containers.conf usage", func() { }) - AfterEach(func() { - os.Unsetenv("CONTAINERS_CONF") - os.Unsetenv("CONTAINERS_CONF_OVERRIDE") - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) - It("limits test", func() { SkipIfRootlessCgroupsV1("Setting limits not supported on cgroupv1 for rootless users") // containers.conf is set to "nofile=500:500" diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go index b4a18cfedc..e2c3148215 100644 --- a/test/e2e/cp_test.go +++ b/test/e2e/cp_test.go @@ -17,27 +17,6 @@ import ( // rather than e2e tests. System tests are used in RHEL gating. var _ = Describe("Podman cp", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) // Copy a file to the container, then back to the host and make sure // that the contents match. diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go index 87d08365e5..01bd0323e3 100644 --- a/test/e2e/create_staticip_test.go +++ b/test/e2e/create_staticip_test.go @@ -1,7 +1,6 @@ package integration import ( - "os" "time" . "github.com/containers/podman/v4/test/utils" @@ -11,27 +10,6 @@ import ( ) var _ = Describe("Podman create with --ip flag", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("Podman create --ip with garbage address", func() { result := podmanTest.Podman([]string{"create", "--name", "test", "--ip", "114232346", ALPINE, "ls"}) diff --git a/test/e2e/create_staticmac_test.go b/test/e2e/create_staticmac_test.go index fa0545dda7..a0032dd43d 100644 --- a/test/e2e/create_staticmac_test.go +++ b/test/e2e/create_staticmac_test.go @@ -1,9 +1,6 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -11,27 +8,6 @@ import ( ) var _ = Describe("Podman run with --mac-address flag", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("Podman run --mac-address", func() { result := podmanTest.Podman([]string{"run", "--mac-address", "92:d0:c6:0a:29:34", ALPINE, "ip", "addr"}) diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go index 3b8c2bed7f..dfe6a06298 100644 --- a/test/e2e/create_test.go +++ b/test/e2e/create_test.go @@ -15,25 +15,6 @@ import ( ) var _ = Describe("Podman create", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - Expect(err).ToNot(HaveOccurred()) - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman create container based on a local image", func() { session := podmanTest.Podman([]string{"create", "--name", "local_image_test", ALPINE, "ls"}) diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index 212d740c97..55c583c36d 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" "sort" . "github.com/containers/podman/v4/test/utils" @@ -13,27 +12,6 @@ import ( ) var _ = Describe("Podman diff", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman diff of image", func() { session := podmanTest.Podman([]string{"diff", ALPINE}) diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index b30fcc57e1..61e8fc14c2 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -3,12 +3,10 @@ package integration import ( "encoding/json" "fmt" - "os" "sync" "time" "github.com/containers/podman/v4/libpod/events" - . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -16,26 +14,6 @@ import ( ) var _ = Describe("Podman events", func() { - var ( - tempdir string - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - var err error - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) // For most, all, of these tests we do not "live" test following a log because it may make a fragile test // system more complex. Instead we run the "events" and then verify that the events are processed correctly. diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 9fe2050ea2..ed82449ee2 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -13,27 +13,6 @@ import ( ) var _ = Describe("Podman exec", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman exec into bogus container", func() { session := podmanTest.Podman([]string{"exec", "foobar", "ls"}) diff --git a/test/e2e/exists_test.go b/test/e2e/exists_test.go index e1f327400a..269a5f8551 100644 --- a/test/e2e/exists_test.go +++ b/test/e2e/exists_test.go @@ -1,36 +1,12 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman image|container exists", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman image exists in local storage by fq name", func() { session := podmanTest.Podman([]string{"image", "exists", ALPINE}) diff --git a/test/e2e/export_test.go b/test/e2e/export_test.go index d80828d77d..644f32d265 100644 --- a/test/e2e/export_test.go +++ b/test/e2e/export_test.go @@ -11,27 +11,6 @@ import ( ) var _ = Describe("Podman export", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman export output flag", func() { _, ec, cid := podmanTest.RunLsContainer("") diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go index c5ebd74b5a..d0baa4671a 100644 --- a/test/e2e/generate_kube_test.go +++ b/test/e2e/generate_kube_test.go @@ -19,27 +19,6 @@ import ( ) var _ = Describe("Podman kube generate", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman kube generate pod on bogus object", func() { session := podmanTest.Podman([]string{"generate", "kube", "foobar"}) diff --git a/test/e2e/generate_spec_test.go b/test/e2e/generate_spec_test.go index dc8cdc607a..c036327372 100644 --- a/test/e2e/generate_spec_test.go +++ b/test/e2e/generate_spec_test.go @@ -1,7 +1,6 @@ package integration import ( - "os" "path/filepath" . "github.com/containers/podman/v4/test/utils" @@ -11,27 +10,9 @@ import ( ) var _ = Describe("Podman generate spec", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRemote("podman generate spec is not supported on the remote client") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman generate spec bogus should fail", func() { diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go index 4a2fccf816..b3cc35d1cb 100644 --- a/test/e2e/generate_systemd_test.go +++ b/test/e2e/generate_systemd_test.go @@ -11,27 +11,6 @@ import ( ) var _ = Describe("Podman generate systemd", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman generate systemd on bogus container/pod", func() { session := podmanTest.Podman([]string{"generate", "systemd", "foobar"}) diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go index 0bfbe45717..ab8de89262 100644 --- a/test/e2e/healthcheck_run_test.go +++ b/test/e2e/healthcheck_run_test.go @@ -14,27 +14,6 @@ import ( ) var _ = Describe("Podman healthcheck run", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman healthcheck run bogus container", func() { session := podmanTest.Podman([]string{"healthcheck", "run", "foobar"}) diff --git a/test/e2e/history_test.go b/test/e2e/history_test.go index 000356bebf..6cb8294ca4 100644 --- a/test/e2e/history_test.go +++ b/test/e2e/history_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,27 +8,6 @@ import ( ) var _ = Describe("Podman history", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman history output flag", func() { session := podmanTest.Podman([]string{"history", ALPINE}) diff --git a/test/e2e/image_scp_test.go b/test/e2e/image_scp_test.go index 53cd0f2821..c8c16f6cf9 100644 --- a/test/e2e/image_scp_test.go +++ b/test/e2e/image_scp_test.go @@ -13,42 +13,8 @@ import ( ) var _ = Describe("podman image scp", func() { - ConfPath := struct { - Value string - IsSet bool - }{} - var ( - tempdir string - podmanTest *PodmanTestIntegration - ) - BeforeEach(func() { - ConfPath.Value, ConfPath.IsSet = os.LookupEnv("CONTAINERS_CONF") - conf, err := os.CreateTemp("", "containersconf") - Expect(err).ToNot(HaveOccurred()) - - os.Setenv("CONTAINERS_CONF", conf.Name()) - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - - os.Remove(os.Getenv("CONTAINERS_CONF")) - if ConfPath.IsSet { - os.Setenv("CONTAINERS_CONF", ConfPath.Value) - } else { - os.Unsetenv("CONTAINERS_CONF") - } - f := CurrentSpecReport() - processTestResult(f) - - }) + BeforeEach(setupEmptyContainersConf) It("podman image scp bogus image", func() { scp := podmanTest.Podman([]string{"image", "scp", "FOOBAR"}) diff --git a/test/e2e/image_sign_test.go b/test/e2e/image_sign_test.go index 9111891ae9..e1706ad710 100644 --- a/test/e2e/image_sign_test.go +++ b/test/e2e/image_sign_test.go @@ -5,28 +5,16 @@ import ( "os/exec" "path/filepath" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman image sign", func() { - var ( - origGNUPGHOME string - tempdir string - err error - podmanTest *PodmanTestIntegration - ) + var origGNUPGHOME string BeforeEach(func() { SkipIfRemote("podman-remote image sign is not supported") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() tempGNUPGHOME := filepath.Join(podmanTest.TempDir, "tmpGPG") err := os.Mkdir(tempGNUPGHOME, os.ModePerm) Expect(err).ToNot(HaveOccurred()) @@ -38,9 +26,6 @@ var _ = Describe("Podman image sign", func() { }) AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) os.Setenv("GNUPGHOME", origGNUPGHOME) }) diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 67726411e4..7b10797e15 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" "sort" "strings" @@ -14,27 +13,7 @@ import ( ) var _ = Describe("Podman images", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman images", func() { session := podmanTest.Podman([]string{"images"}) session.WaitWithDefaultTimeout() diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go index f2366968d5..58ae697347 100644 --- a/test/e2e/import_test.go +++ b/test/e2e/import_test.go @@ -1,7 +1,6 @@ package integration import ( - "os" "path/filepath" . "github.com/containers/podman/v4/test/utils" @@ -11,27 +10,6 @@ import ( ) var _ = Describe("Podman import", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman import with source and reference", func() { outfile := filepath.Join(podmanTest.TempDir, "container.tar") diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go index f7e1febddb..ad97ffda1d 100644 --- a/test/e2e/info_test.go +++ b/test/e2e/info_test.go @@ -7,33 +7,12 @@ import ( "os/user" "path/filepath" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman Info", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman info --format json", func() { tests := []struct { diff --git a/test/e2e/init_test.go b/test/e2e/init_test.go index 27744c45cb..6f1dc6e329 100644 --- a/test/e2e/init_test.go +++ b/test/e2e/init_test.go @@ -1,36 +1,12 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman init", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman init bogus container", func() { session := podmanTest.Podman([]string{"start", "123456"}) diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go index e703709b07..2f65fd4bcb 100644 --- a/test/e2e/inspect_test.go +++ b/test/e2e/inspect_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -11,27 +9,6 @@ import ( ) var _ = Describe("Podman inspect", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman inspect alpine image", func() { session := podmanTest.Podman([]string{"inspect", "--format=json", ALPINE}) diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go index 8277da7e2b..91e922112f 100644 --- a/test/e2e/kill_test.go +++ b/test/e2e/kill_test.go @@ -10,27 +10,6 @@ import ( ) var _ = Describe("Podman kill", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman kill bogus container", func() { session := podmanTest.Podman([]string{"kill", "foobar"}) diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go index 979498ffff..abca272883 100644 --- a/test/e2e/load_test.go +++ b/test/e2e/load_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" "path/filepath" . "github.com/containers/podman/v4/test/utils" @@ -12,29 +11,11 @@ import ( ) var _ = Describe("Podman load", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() podmanTest.AddImageToRWStore(ALPINE) }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) - It("podman load input flag", func() { outfile := filepath.Join(podmanTest.TempDir, "alpine.tar") diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go index 17a9017e5d..b8d6f193e4 100644 --- a/test/e2e/login_logout_test.go +++ b/test/e2e/login_logout_test.go @@ -16,9 +16,7 @@ import ( var _ = Describe("Podman login and logout", func() { var ( - tempdir string err error - podmanTest *PodmanTestIntegration authPath string certPath string certDirPath string @@ -28,11 +26,6 @@ var _ = Describe("Podman login and logout", func() { ) BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) authPath = filepath.Join(podmanTest.TempDir, "auth") err := os.Mkdir(authPath, os.ModePerm) @@ -98,7 +91,6 @@ var _ = Describe("Podman login and logout", func() { AfterEach(func() { os.Unsetenv("REGISTRY_AUTH_FILE") - podmanTest.Cleanup() os.RemoveAll(authPath) os.RemoveAll(certDirPath) }) diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index 9dcc953e0b..d17735a9d9 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" "os/exec" "time" @@ -24,26 +23,6 @@ func isEventBackendJournald(podmanTest *PodmanTestIntegration) bool { } var _ = Describe("Podman logs", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman logs on not existent container", func() { results := podmanTest.Podman([]string{"logs", "notexist"}) diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go index 33f75452b1..47c35dd365 100644 --- a/test/e2e/manifest_test.go +++ b/test/e2e/manifest_test.go @@ -16,11 +16,6 @@ import ( ) var _ = Describe("Podman manifest", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) const ( imageList = "docker://registry.k8s.io/pause:3.1" @@ -32,20 +27,6 @@ var _ = Describe("Podman manifest", func() { imageListS390XInstanceDigest = "sha256:882a20ee0df7399a445285361d38b711c299ca093af978217112c73803546d5e" ) - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("create w/o image and attempt push w/o dest", func() { for _, amend := range []string{"--amend", "-a"} { session := podmanTest.Podman([]string{"manifest", "create", "foo"}) diff --git a/test/e2e/mount_rootless_test.go b/test/e2e/mount_rootless_test.go index a5c678d42e..b230d064ca 100644 --- a/test/e2e/mount_rootless_test.go +++ b/test/e2e/mount_rootless_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,28 +8,10 @@ import ( ) var _ = Describe("Podman mount", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfNotRootless("This function is not enabled for rootful podman") SkipIfRemote("Podman mount not supported for remote connections") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman mount", func() { diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go index 35f1492254..1a85c50e5a 100644 --- a/test/e2e/mount_test.go +++ b/test/e2e/mount_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,31 +8,13 @@ import ( ) var _ = Describe("Podman mount", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRemote("Podman mount not supported for remote connections") SkipIfRootless("Podman mount requires podman unshare first to work") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() podmanTest.AddImageToRWStore(ALPINE) }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) - It("podman mount", func() { setup := podmanTest.Podman([]string{"create", ALPINE, "ls"}) setup.WaitWithDefaultTimeout() diff --git a/test/e2e/negative_test.go b/test/e2e/negative_test.go index c22309a4e4..4e8398c6a4 100644 --- a/test/e2e/negative_test.go +++ b/test/e2e/negative_test.go @@ -1,34 +1,12 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) var _ = Describe("Podman negative command-line", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman snuffleupagus exits non-zero", func() { session := podmanTest.Podman([]string{"snuffleupagus"}) diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go index 340b8073ee..3b93754dfa 100644 --- a/test/e2e/network_connect_disconnect_test.go +++ b/test/e2e/network_connect_disconnect_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" @@ -12,27 +10,6 @@ import ( ) var _ = Describe("Podman network connect and disconnect", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("bad network name in disconnect should result in error", func() { dis := podmanTest.Podman([]string{"network", "disconnect", "foobar", "test"}) diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go index 1e770e7219..467a8838c0 100644 --- a/test/e2e/network_create_test.go +++ b/test/e2e/network_create_test.go @@ -3,7 +3,6 @@ package integration import ( "encoding/json" "net" - "os" "github.com/containers/common/libnetwork/types" . "github.com/containers/podman/v4/test/utils" @@ -19,26 +18,6 @@ func removeNetworkDevice(name string) { } var _ = Describe("Podman network create", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman network create with name and subnet", func() { netName := "subnet-" + stringid.GenerateRandomID() diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 5f69a7a78e..f260069493 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -3,7 +3,6 @@ package integration import ( "encoding/json" "fmt" - "os" "path/filepath" "time" @@ -16,27 +15,6 @@ import ( ) var _ = Describe("Podman network", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman --cni-config-dir backwards compat", func() { SkipIfRemote("--cni-config-dir only works locally") diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index d91fc018ac..c3ec08a6c6 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -13,21 +13,11 @@ import ( ) var _ = Describe("Podman pause", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - pausedState := "paused" createdState := "created" BeforeEach(func() { SkipIfRootlessCgroupsV1("Pause is not supported in cgroups v1") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } if CGROUPSV2 { b, err := os.ReadFile("/proc/self/cgroup") @@ -42,15 +32,6 @@ var _ = Describe("Podman pause", func() { } } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman pause bogus container", func() { diff --git a/test/e2e/play_build_test.go b/test/e2e/play_build_test.go index 3be6a16756..41482c49e7 100644 --- a/test/e2e/play_build_test.go +++ b/test/e2e/play_build_test.go @@ -16,27 +16,6 @@ import ( ) var _ = Describe("Podman play kube with build", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) var testYAML = ` apiVersion: v1 diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 0f724fe628..9b8c9a2f39 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -1854,29 +1854,12 @@ func verifyPodPorts(podmanTest *PodmanTestIntegration, podName string, ports ... } var _ = Describe("Podman play kube", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - kubeYaml string - ) + var kubeYaml string BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() kubeYaml = filepath.Join(podmanTest.TempDir, "kube.yaml") }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) - It("podman play kube fail with yaml of unsupported kind", func() { err := writeYaml(unknownKindYaml, kubeYaml) Expect(err).ToNot(HaveOccurred()) @@ -1966,7 +1949,6 @@ var _ = Describe("Podman play kube", func() { Expect(err).ToNot(HaveOccurred()) os.Setenv("CONTAINERS_CONF", conffile) - defer os.Unsetenv("CONTAINERS_CONF") if IsRemote() { podmanTest.RestartRemoteService() @@ -4105,7 +4087,6 @@ invalid kube kind confPath, err := filepath.Abs("config/containers-netns2.conf") Expect(err).ToNot(HaveOccurred()) os.Setenv("CONTAINERS_CONF", confPath) - defer os.Unsetenv("CONTAINERS_CONF") if IsRemote() { podmanTest.RestartRemoteService() } @@ -4897,7 +4878,6 @@ ENV OPENJ9_JAVA_OPTIONS=%q ipcns="host" cgroups="disabled"`), 0644) Expect(err).ToNot(HaveOccurred()) - defer os.Unsetenv("CONTAINERS_CONF") os.Setenv("CONTAINERS_CONF", conffile) err = writeYaml(simplePodYaml, kubeYaml) Expect(err).ToNot(HaveOccurred()) diff --git a/test/e2e/pod_clone_test.go b/test/e2e/pod_clone_test.go index 015cf15fff..90d47a3870 100644 --- a/test/e2e/pod_clone_test.go +++ b/test/e2e/pod_clone_test.go @@ -3,35 +3,17 @@ package integration import ( "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman pod clone", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - hostname, _ = os.Hostname() - ) + + hostname, _ := os.Hostname() BeforeEach(func() { SkipIfRemote("podman pod clone is not supported in remote") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman pod clone basic test", func() { diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index 8f0c3fa372..7c6da34ab0 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -21,28 +21,7 @@ import ( ) var _ = Describe("Podman pod create", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - hostname, _ = os.Hostname() - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) + hostname, _ := os.Hostname() It("podman create pod", func() { _, ec, podID := podmanTest.CreatePod(nil) @@ -952,7 +931,6 @@ ENTRYPOINT ["sleep","99999"] confPath, err := filepath.Abs("config/containers-netns.conf") Expect(err).ToNot(HaveOccurred()) os.Setenv("CONTAINERS_CONF", confPath) - defer os.Unsetenv("CONTAINERS_CONF") if IsRemote() { podmanTest.RestartRemoteService() } diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go index 029d542c3a..69d1381ed3 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -1,7 +1,6 @@ package integration import ( - "os" "strconv" . "github.com/containers/podman/v4/test/utils" @@ -11,27 +10,6 @@ import ( ) var _ = Describe("Podman pod create", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman create infra container", func() { session := podmanTest.Podman([]string{"pod", "create"}) diff --git a/test/e2e/pod_initcontainers_test.go b/test/e2e/pod_initcontainers_test.go index fb09631d22..7ce2b13145 100644 --- a/test/e2e/pod_initcontainers_test.go +++ b/test/e2e/pod_initcontainers_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" "path/filepath" "github.com/containers/podman/v4/libpod/define" @@ -13,27 +12,6 @@ import ( ) var _ = Describe("Podman init containers", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman create init container without --pod should fail", func() { session := podmanTest.Podman([]string{"create", "--init-ctr", "always", ALPINE, "top"}) diff --git a/test/e2e/pod_inspect_test.go b/test/e2e/pod_inspect_test.go index e49c6a40d8..60d7de17cd 100644 --- a/test/e2e/pod_inspect_test.go +++ b/test/e2e/pod_inspect_test.go @@ -2,7 +2,6 @@ package integration import ( "encoding/json" - "os" "github.com/containers/podman/v4/libpod/define" . "github.com/containers/podman/v4/test/utils" @@ -12,27 +11,6 @@ import ( ) var _ = Describe("Podman pod inspect", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman inspect bogus pod", func() { session := podmanTest.Podman([]string{"pod", "inspect", "foobar"}) diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go index 049d0646da..b8c529f656 100644 --- a/test/e2e/pod_kill_test.go +++ b/test/e2e/pod_kill_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,27 +8,6 @@ import ( ) var _ = Describe("Podman pod kill", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman pod kill bogus", func() { session := podmanTest.Podman([]string{"pod", "kill", "foobar"}) diff --git a/test/e2e/pod_pause_test.go b/test/e2e/pod_pause_test.go index 34e297330a..294365a204 100644 --- a/test/e2e/pod_pause_test.go +++ b/test/e2e/pod_pause_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,29 +8,10 @@ import ( ) var _ = Describe("Podman pod pause", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - pausedState := "Paused" BeforeEach(func() { SkipIfRootlessCgroupsV1("Pause is not supported in cgroups v1") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman pod pause bogus pod", func() { diff --git a/test/e2e/pod_pod_namespaces_test.go b/test/e2e/pod_pod_namespaces_test.go index f466dcedd6..109d42b364 100644 --- a/test/e2e/pod_pod_namespaces_test.go +++ b/test/e2e/pod_pod_namespaces_test.go @@ -1,36 +1,12 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman pod create", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman pod container share Namespaces", func() { session := podmanTest.Podman([]string{"pod", "create"}) diff --git a/test/e2e/pod_prune_test.go b/test/e2e/pod_prune_test.go index c4321d56f2..f5043de815 100644 --- a/test/e2e/pod_prune_test.go +++ b/test/e2e/pod_prune_test.go @@ -1,36 +1,12 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman pod prune", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman pod prune empty pod", func() { _, ec, _ := podmanTest.CreatePod(nil) diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go index 2281c5849a..be58397c6e 100644 --- a/test/e2e/pod_ps_test.go +++ b/test/e2e/pod_ps_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" "sort" . "github.com/containers/podman/v4/test/utils" @@ -13,27 +12,6 @@ import ( ) var _ = Describe("Podman ps", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman pod ps no pods", func() { session := podmanTest.Podman([]string{"pod", "ps"}) diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go index 8a93cfd168..f68e282235 100644 --- a/test/e2e/pod_restart_test.go +++ b/test/e2e/pod_restart_test.go @@ -1,36 +1,12 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman pod restart", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman pod restart bogus pod", func() { session := podmanTest.Podman([]string{"pod", "restart", "123"}) diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go index 3043b611ad..ef32e30b22 100644 --- a/test/e2e/pod_rm_test.go +++ b/test/e2e/pod_rm_test.go @@ -15,27 +15,6 @@ import ( ) var _ = Describe("Podman pod rm", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman pod rm empty pod", func() { _, ec, podid := podmanTest.CreatePod(nil) diff --git a/test/e2e/pod_start_test.go b/test/e2e/pod_start_test.go index 2bf73a491b..b04d5a1196 100644 --- a/test/e2e/pod_start_test.go +++ b/test/e2e/pod_start_test.go @@ -13,27 +13,6 @@ import ( ) var _ = Describe("Podman pod start", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman pod start bogus pod", func() { session := podmanTest.Podman([]string{"pod", "start", "123"}) diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index a5c944d08d..3d5d02da5f 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,32 +8,14 @@ import ( ) var _ = Describe("Podman pod stats", func() { - var ( - err error - tempdir string - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRootlessCgroupsV1("Tests fail with both CGv1 + required --cgroup-manager=cgroupfs") if isContainerized() { SkipIfCgroupV1("All tests fail Error: unable to load cgroup at ...: cgroup deleted") } - - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman pod stats should run with no pods", func() { session := podmanTest.Podman([]string{"pod", "stats", "--no-stream"}) session.WaitWithDefaultTimeout() diff --git a/test/e2e/pod_stop_test.go b/test/e2e/pod_stop_test.go index 0af9c1abf2..9739078f2e 100644 --- a/test/e2e/pod_stop_test.go +++ b/test/e2e/pod_stop_test.go @@ -3,34 +3,12 @@ package integration import ( "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman pod stop", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman pod stop bogus pod", func() { session := podmanTest.Podman([]string{"pod", "stop", "123"}) diff --git a/test/e2e/pod_top_test.go b/test/e2e/pod_top_test.go index 263721d670..bde2920191 100644 --- a/test/e2e/pod_top_test.go +++ b/test/e2e/pod_top_test.go @@ -2,37 +2,14 @@ package integration import ( "fmt" - "os" "time" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman top", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman pod top without pod name or id", func() { result := podmanTest.Podman([]string{"pod", "top"}) diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go index ca859473d9..eab738a753 100644 --- a/test/e2e/port_test.go +++ b/test/e2e/port_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" "strings" . "github.com/containers/podman/v4/test/utils" @@ -12,27 +11,6 @@ import ( ) var _ = Describe("Podman port", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman port all and latest", func() { result := podmanTest.Podman([]string{"port", "-a", "-l"}) diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index ee7fe863f3..913383fc80 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -5,7 +5,6 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" @@ -23,27 +22,6 @@ ENV test1=test1 ENV test2=test2` var _ = Describe("Podman prune", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman container prune containers", func() { top := podmanTest.RunTopContainer("") diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index e1efdf2a6b..7f6dfc60b3 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" "regexp" "sort" "strconv" @@ -16,27 +15,6 @@ import ( ) var _ = Describe("Podman ps", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman ps no containers", func() { session := podmanTest.Podman([]string{"ps"}) diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index 6e0f2586f0..ffa9d33197 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -13,27 +13,6 @@ import ( ) var _ = Describe("Podman pull", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman pull multiple images with/without tag/digest", func() { session := podmanTest.Podman([]string{"pull", "busybox:musl", "alpine", "alpine:latest", "quay.io/libpod/cirros", "quay.io/libpod/testdigest_v2s2@sha256:755f4d90b3716e2bf57060d249e2cd61c9ac089b1233465c5c2cb2d7ee550fdb"}) diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index da886e24e7..037a77111e 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -15,29 +15,11 @@ import ( ) var _ = Describe("Podman push", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() podmanTest.AddImageToRWStore(ALPINE) }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) - It("podman push to containers/storage", func() { SkipIfRemote("Remote push does not support containers-storage transport") session := podmanTest.Podman([]string{"push", ALPINE, "containers-storage:busybox:test"}) diff --git a/test/e2e/quadlet_test.go b/test/e2e/quadlet_test.go index 5b1e0cc5c6..32f7080c13 100644 --- a/test/e2e/quadlet_test.go +++ b/test/e2e/quadlet_test.go @@ -12,7 +12,6 @@ import ( "github.com/containers/podman/v4/version" "github.com/mattn/go-shellwords" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" @@ -395,21 +394,12 @@ func (t *quadletTestcase) check(generateDir string, session *PodmanSessionIntegr var _ = Describe("quadlet system generator", func() { var ( - tempdir string err error generatedDir string quadletDir string - podmanTest *PodmanTestIntegration ) BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - generatedDir = filepath.Join(podmanTest.TempDir, "generated") err = os.Mkdir(generatedDir, os.ModePerm) Expect(err).ToNot(HaveOccurred()) @@ -419,13 +409,6 @@ var _ = Describe("quadlet system generator", func() { Expect(err).ToNot(HaveOccurred()) }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) - Describe("quadlet -version", func() { It("Should print correct version", func() { session := podmanTest.Quadlet([]string{"-version"}, "/something") diff --git a/test/e2e/rename_test.go b/test/e2e/rename_test.go index 81cb6fd618..5c1c75ecb7 100644 --- a/test/e2e/rename_test.go +++ b/test/e2e/rename_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" @@ -11,27 +10,6 @@ import ( ) var _ = Describe("podman rename", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman rename on non-existent container", func() { session := podmanTest.Podman([]string{"rename", "doesNotExist", "aNewName"}) diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index 6b52816e8a..89bd08448a 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -12,27 +12,6 @@ import ( ) var _ = Describe("Podman restart", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman restart bogus container", func() { session := podmanTest.Podman([]string{"start", "123"}) diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index 35d22a860d..d276ed838f 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -4,34 +4,12 @@ import ( "fmt" "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman rm", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman rm stopped container", func() { _, ec, cid := podmanTest.RunLsContainer("") diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index d959da2614..10e9f496f3 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" "sync" . "github.com/containers/podman/v4/test/utils" @@ -12,27 +11,6 @@ import ( ) var _ = Describe("Podman rmi", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman rmi bogus image", func() { session := podmanTest.Podman([]string{"rmi", "debian:6.0.10"}) diff --git a/test/e2e/run_aardvark_test.go b/test/e2e/run_aardvark_test.go index 01e5efdc3a..aadbe3bc43 100644 --- a/test/e2e/run_aardvark_test.go +++ b/test/e2e/run_aardvark_test.go @@ -2,39 +2,19 @@ package integration import ( "fmt" - "os" "strings" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman run networking", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() SkipIfCNI(podmanTest) }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) - It("Aardvark Test 1: One container", func() { netName := createNetworkName("Test") session := podmanTest.Podman([]string{"network", "create", netName}) diff --git a/test/e2e/run_apparmor_test.go b/test/e2e/run_apparmor_test.go index 27e06b74ef..6e7661683b 100644 --- a/test/e2e/run_apparmor_test.go +++ b/test/e2e/run_apparmor_test.go @@ -28,27 +28,6 @@ func skipIfAppArmorDisabled() { } var _ = Describe("Podman run", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman run apparmor default", func() { skipIfAppArmorDisabled() diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go index b2ffee1648..14d721b181 100644 --- a/test/e2e/run_cgroup_parent_test.go +++ b/test/e2e/run_cgroup_parent_test.go @@ -15,27 +15,9 @@ import ( const cgroupRoot = "/sys/fs/cgroup" var _ = Describe("Podman run with --cgroup-parent", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRootlessCgroupsV1("cgroup parent is not supported in cgroups v1") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) Specify("valid --cgroup-parent using cgroupfs", func() { diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go index e5b3b74657..9227f41cad 100644 --- a/test/e2e/run_cleanup_test.go +++ b/test/e2e/run_cleanup_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,29 +8,6 @@ import ( ) var _ = Describe("Podman run exit", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - err = podmanTest.RestoreArtifact(ALPINE) - Expect(err).ToNot(HaveOccurred()) - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman run -d mount cleanup test", func() { SkipIfRemote("podman-remote does not support mount") diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go index a34603211c..04e02bc735 100644 --- a/test/e2e/run_cpu_test.go +++ b/test/e2e/run_cpu_test.go @@ -10,35 +10,15 @@ import ( ) var _ = Describe("Podman run cpu", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRootlessCgroupsV1("Setting CPU not supported on cgroupv1 for rootless users") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - if CGROUPSV2 { if err := os.WriteFile("/sys/fs/cgroup/cgroup.subtree_control", []byte("+cpuset"), 0644); err != nil { Skip("cpuset controller not available on the current kernel") } } - - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman run cpu-period", func() { diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go index 45e980dd10..aa8beeb2e6 100644 --- a/test/e2e/run_device_test.go +++ b/test/e2e/run_device_test.go @@ -26,27 +26,6 @@ func createContainersConfFileWithDevices(pTest *PodmanTestIntegration, devices s } var _ = Describe("Podman run device", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - os.Unsetenv("CONTAINERS_CONF") - }) It("podman run bad device test", func() { session := podmanTest.Podman([]string{"run", "-q", "--device", "/dev/baddevice", ALPINE, "true"}) diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go index 326c26a1d4..c68a8410f8 100644 --- a/test/e2e/run_dns_test.go +++ b/test/e2e/run_dns_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,27 +8,6 @@ import ( ) var _ = Describe("Podman run dns", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman run add search domain", func() { session := podmanTest.Podman([]string{"run", "--dns-search=foobar.com", ALPINE, "cat", "/etc/resolv.conf"}) diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go index 69f623a317..5af2592642 100644 --- a/test/e2e/run_entrypoint_test.go +++ b/test/e2e/run_entrypoint_test.go @@ -1,36 +1,12 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman run entrypoint", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman run no command, entrypoint, or cmd", func() { dockerfile := `FROM quay.io/libpod/alpine:latest diff --git a/test/e2e/run_env_test.go b/test/e2e/run_env_test.go index 70f4a3746d..5ba6bbe98d 100644 --- a/test/e2e/run_env_test.go +++ b/test/e2e/run_env_test.go @@ -3,34 +3,12 @@ package integration import ( "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman run", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman run environment test", func() { session := podmanTest.Podman([]string{"run", "--rm", ALPINE, "printenv", "HOME"}) diff --git a/test/e2e/run_exit_test.go b/test/e2e/run_exit_test.go index 27799820c9..6809da0681 100644 --- a/test/e2e/run_exit_test.go +++ b/test/e2e/run_exit_test.go @@ -2,37 +2,14 @@ package integration import ( "fmt" - "os" "github.com/containers/podman/v4/libpod/define" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman run exit", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman run exit define.ExecErrorCodeGeneric", func() { result := podmanTest.Podman([]string{"run", "--foobar", ALPINE, "ls", "$tmp"}) diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go index 92cbb027fe..584c6d6e4c 100644 --- a/test/e2e/run_memory_test.go +++ b/test/e2e/run_memory_test.go @@ -2,37 +2,16 @@ package integration import ( "fmt" - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman run memory", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRootlessCgroupsV1("Setting Memory not supported on cgroupv1 for rootless users") - - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman run memory test", func() { diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index bd411be2ab..8b4b587c4f 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -19,28 +19,8 @@ import ( ) var _ = Describe("Podman run networking", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - hostname, _ = os.Hostname() - ) - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) + hostname, _ := os.Hostname() It("podman verify network scoped DNS server and also verify updating network dns server", func() { // Following test is only functional with netavark and aardvark diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index 9eac8801b0..53c3645f4e 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -1,7 +1,6 @@ package integration import ( - "os" "os/exec" "strings" @@ -12,27 +11,6 @@ import ( ) var _ = Describe("Podman run ns", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman run pidns test", func() { SkipIfRootlessCgroupsV1("Not supported for rootless + CgroupsV1") diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go index f7de668eac..361db1e5a8 100644 --- a/test/e2e/run_passwd_test.go +++ b/test/e2e/run_passwd_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" @@ -11,27 +10,6 @@ import ( ) var _ = Describe("Podman run passwd", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman run no user specified ", func() { session := podmanTest.Podman([]string{"run", "--read-only", BB, "mount"}) diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go index 85a04090ca..426dc52960 100644 --- a/test/e2e/run_privileged_test.go +++ b/test/e2e/run_privileged_test.go @@ -36,27 +36,6 @@ func containerCapMatchesHost(ctrCap string, hostCap string) { } var _ = Describe("Podman privileged container tests", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman privileged make sure sys is mounted rw", func() { session := podmanTest.Podman([]string{"run", "--privileged", BB, "mount"}) diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go index 3a4a8897fa..ab419d36f4 100644 --- a/test/e2e/run_restart_test.go +++ b/test/e2e/run_restart_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,27 +8,6 @@ import ( ) var _ = Describe("Podman run restart containers", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("Podman start after successful run", func() { session := podmanTest.Podman([]string{"run", "--name", "test", ALPINE, "ls"}) diff --git a/test/e2e/run_seccomp_test.go b/test/e2e/run_seccomp_test.go index 6d3dfdfe79..a4dccc0351 100644 --- a/test/e2e/run_seccomp_test.go +++ b/test/e2e/run_seccomp_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,27 +8,6 @@ import ( ) var _ = Describe("Podman run", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman run --seccomp-policy default", func() { session := podmanTest.Podman([]string{"run", "--seccomp-policy", "default", alpineSeccomp, "ls"}) diff --git a/test/e2e/run_security_labels_test.go b/test/e2e/run_security_labels_test.go index a4ccb07048..0d45d18d3f 100644 --- a/test/e2e/run_security_labels_test.go +++ b/test/e2e/run_security_labels_test.go @@ -2,36 +2,14 @@ package integration import ( "fmt" - "os" "strings" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman generate kube", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman security labels", func() { test1 := podmanTest.Podman([]string{"create", "--label", "io.containers.capabilities=setuid,setgid", "--name", "test1", "alpine", "echo", "test1"}) diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go index 66ba22185d..de5a9cd48a 100644 --- a/test/e2e/run_selinux_test.go +++ b/test/e2e/run_selinux_test.go @@ -4,7 +4,6 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" @@ -12,31 +11,12 @@ import ( ) var _ = Describe("Podman run", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() if !selinux.GetEnabled() { Skip("SELinux not enabled") } }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) - It("podman run selinux", func() { session := podmanTest.Podman([]string{"run", ALPINE, "cat", "/proc/self/attr/current"}) session.WaitWithDefaultTimeout() diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index d1c4d5d0f2..ac63ca97c4 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -20,27 +20,6 @@ const sigCatch = "trap \"echo FOO >> /h/fifo \" 8; echo READY >> /h/fifo; while const sigCatch2 = "trap \"echo Received\" SIGFPE; while :; do sleep 0.25; done" var _ = Describe("Podman run with --sig-proxy", func() { - var ( - tmpdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tmpdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tmpdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) Specify("signals are forwarded to container using sig-proxy", func() { if podmanTest.Host.Arch == "ppc64le" { @@ -48,7 +27,7 @@ var _ = Describe("Podman run with --sig-proxy", func() { } signal := syscall.SIGFPE // Set up a socket for communication - udsDir := filepath.Join(tmpdir, "socket") + udsDir := filepath.Join(tempdir, "socket") err := os.Mkdir(udsDir, 0700) Expect(err).ToNot(HaveOccurred()) udsPath := filepath.Join(udsDir, "fifo") diff --git a/test/e2e/run_staticip_test.go b/test/e2e/run_staticip_test.go index 4244e72a74..a103453dcc 100644 --- a/test/e2e/run_staticip_test.go +++ b/test/e2e/run_staticip_test.go @@ -3,7 +3,6 @@ package integration import ( "fmt" "net/http" - "os" "time" . "github.com/containers/podman/v4/test/utils" @@ -14,27 +13,9 @@ import ( ) var _ = Describe("Podman run with --ip flag", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRootless("rootless does not support --ip without network") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("Podman run --ip with garbage address", func() { diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index b2150b7e09..f2c99100e4 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -21,26 +21,6 @@ import ( ) var _ = Describe("Podman run", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman run a container based on local image", func() { session := podmanTest.Podman([]string{"run", ALPINE, "ls"}) diff --git a/test/e2e/run_transient_test.go b/test/e2e/run_transient_test.go index afb45f0723..d7f74569f6 100644 --- a/test/e2e/run_transient_test.go +++ b/test/e2e/run_transient_test.go @@ -1,7 +1,6 @@ package integration import ( - "os" "path/filepath" . "github.com/containers/podman/v4/test/utils" @@ -12,10 +11,6 @@ import ( var _ = Describe("Podman run with volumes", func() { var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - containerStorageDir string dbDir string runContainerStorageDir string @@ -23,25 +18,12 @@ var _ = Describe("Podman run with volumes", func() { ) BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - containerStorageDir = filepath.Join(podmanTest.Root, podmanTest.ImageCacheFS+"-containers") dbDir = filepath.Join(podmanTest.Root, "libpod") runContainerStorageDir = filepath.Join(podmanTest.RunRoot, podmanTest.ImageCacheFS+"-containers") runDBDir = tempdir }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) - It("podman run with no transient-store", func() { session := podmanTest.Podman([]string{"run", ALPINE, "true"}) session.WaitWithDefaultTimeout() diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index 178a3db8e7..4f4aa80b92 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -7,7 +7,6 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -28,12 +27,6 @@ func createContainersConfFileWithCustomUserns(pTest *PodmanTestIntegration, user } var _ = Describe("Podman UserNS support", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - BeforeEach(func() { if os.Getenv("SKIP_USERNS") != "" { Skip("Skip userns tests.") @@ -41,19 +34,6 @@ var _ = Describe("Podman UserNS support", func() { if _, err := os.Stat("/proc/self/uid_map"); err != nil { Skip("User namespaces not supported.") } - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - os.Unsetenv("CONTAINERS_CONF") }) // Note: Lot of tests for build with --userns=auto are already there in buildah diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index b51075e51c..6016993cc6 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -19,26 +19,6 @@ import ( const dest = "/unique/path" var _ = Describe("Podman run with volumes", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) // Returns the /proc/self/mountinfo line for a given mount point getMountInfo := func(volume string) []string { diff --git a/test/e2e/run_working_dir_test.go b/test/e2e/run_working_dir_test.go index 1e53ecae2e..4167f102ae 100644 --- a/test/e2e/run_working_dir_test.go +++ b/test/e2e/run_working_dir_test.go @@ -5,34 +5,12 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman run", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman run a container without workdir", func() { session := podmanTest.Podman([]string{"run", ALPINE, "pwd"}) diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go index f372d3d858..069be08f7a 100644 --- a/test/e2e/runlabel_test.go +++ b/test/e2e/runlabel_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" @@ -23,27 +22,9 @@ FROM %s LABEL RUN podman run --name NAME IMAGE`, ALPINE) var _ = Describe("podman container runlabel", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRemote("runlabel is not supported for remote connections") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman container runlabel (podman --version)", func() { diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go index 56b1b5d014..580c40a045 100644 --- a/test/e2e/save_test.go +++ b/test/e2e/save_test.go @@ -14,27 +14,6 @@ import ( ) var _ = Describe("Podman save", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman save output flag", func() { outfile := filepath.Join(podmanTest.TempDir, "alpine.tar") diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go index 483239fdf0..71ff2b586e 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/search_test.go @@ -25,11 +25,6 @@ func (e *endpoint) Address() string { } var _ = Describe("Podman search", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) const regFileContents = ` [registries.search] @@ -55,22 +50,6 @@ registries = ['{{.Host}}:{{.Port}}', '{{.Host}}:6000'] registries = ['{{.Host}}:{{.Port}}']` registryFileTwoTmpl := template.Must(template.New("registryFileTwo").Parse(regFileContents2)) - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) - It("podman search", func() { search := podmanTest.Podman([]string{"search", "alpine"}) search.WaitWithDefaultTimeout() diff --git a/test/e2e/secret_test.go b/test/e2e/secret_test.go index 6c91b9a641..6ec05d938a 100644 --- a/test/e2e/secret_test.go +++ b/test/e2e/secret_test.go @@ -12,26 +12,9 @@ import ( ) var _ = Describe("Podman secret", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) AfterEach(func() { podmanTest.CleanupSecrets() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman secret create", func() { diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index 6cba513fc4..1f2603b5ac 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -13,27 +13,6 @@ import ( ) var _ = Describe("Podman start", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman start bogus container", func() { session := podmanTest.Podman([]string{"start", "123"}) diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index 4ea0eff681..c738250b0e 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" "strconv" "time" @@ -15,30 +14,12 @@ import ( // TODO: we need to check the output. Currently, we only check the exit codes // which is not enough. var _ = Describe("Podman stats", func() { - var ( - tempdir string - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRootlessCgroupsV1("stats not supported on cgroupv1 for rootless users") if isContainerized() { SkipIfCgroupV1("stats not supported inside cgroupv1 container environment") } - var err error - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman stats with bogus container", func() { diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index 0e15263c7f..d1e6a8edd4 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -5,34 +5,12 @@ import ( "os" "strings" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman stop", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman stop bogus container", func() { session := podmanTest.Podman([]string{"stop", "foobar"}) diff --git a/test/e2e/system_connection_test.go b/test/e2e/system_connection_test.go index deb46110dd..8100e3598e 100644 --- a/test/e2e/system_connection_test.go +++ b/test/e2e/system_connection_test.go @@ -16,38 +16,18 @@ import ( . "github.com/onsi/gomega/gexec" ) +func setupEmptyContainersConf() { + // make sure connections are not written to real user config on host + file := filepath.Join(podmanTest.TempDir, "containersconf") + f, err := os.Create(file) + Expect(err).ToNot(HaveOccurred()) + f.Close() + os.Setenv("CONTAINERS_CONF", file) +} + var _ = Describe("podman system connection", func() { - ConfPath := struct { - Value string - IsSet bool - }{} - var podmanTest *PodmanTestIntegration - - BeforeEach(func() { - ConfPath.Value, ConfPath.IsSet = os.LookupEnv("CONTAINERS_CONF") - conf, err := os.CreateTemp("", "containersconf") - Expect(err).ToNot(HaveOccurred()) - os.Setenv("CONTAINERS_CONF", conf.Name()) - - tempdir, err := CreateTempDirInTempDir() - Expect(err).ToNot(HaveOccurred()) - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - os.Remove(os.Getenv("CONTAINERS_CONF")) - if ConfPath.IsSet { - os.Setenv("CONTAINERS_CONF", ConfPath.Value) - } else { - os.Unsetenv("CONTAINERS_CONF") - } - - f := CurrentSpecReport() - processTestResult(f) - }) + BeforeEach(setupEmptyContainersConf) Context("without running API service", func() { It("add ssh://", func() { diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go index b051bba32e..0a0c80fff4 100644 --- a/test/e2e/system_df_test.go +++ b/test/e2e/system_df_test.go @@ -1,7 +1,6 @@ package integration import ( - "os" "strconv" "strings" @@ -12,26 +11,6 @@ import ( ) var _ = Describe("podman system df", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman system df", func() { session := podmanTest.Podman([]string{"create", ALPINE}) diff --git a/test/e2e/system_dial_stdio_test.go b/test/e2e/system_dial_stdio_test.go index 15c5e37366..54db3da915 100644 --- a/test/e2e/system_dial_stdio_test.go +++ b/test/e2e/system_dial_stdio_test.go @@ -1,35 +1,12 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("podman system dial-stdio", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman system dial-stdio help", func() { session := podmanTest.Podman([]string{"system", "dial-stdio", "--help"}) diff --git a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go index f6524f5382..0fcd71f732 100644 --- a/test/e2e/system_reset_test.go +++ b/test/e2e/system_reset_test.go @@ -1,9 +1,6 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" @@ -11,26 +8,6 @@ import ( // system reset must run serial: https://github.com/containers/podman/issues/17903 var _ = Describe("podman system reset", Serial, func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman system reset", func() { SkipIfRemote("system reset not supported on podman --remote") diff --git a/test/e2e/system_service_test.go b/test/e2e/system_service_test.go index 337da3c4a1..d39625a71f 100644 --- a/test/e2e/system_service_test.go +++ b/test/e2e/system_service_test.go @@ -8,7 +8,6 @@ import ( "strconv" "time" - . "github.com/containers/podman/v4/test/utils" "github.com/containers/podman/v4/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -16,26 +15,11 @@ import ( ) var _ = Describe("podman system service", func() { - var podmanTest *PodmanTestIntegration // The timeout used to for the service to respond. As shown in #12167, // this may take some time on machines under high load. var timeout = 30 - BeforeEach(func() { - tempdir, err := CreateTempDirInTempDir() - Expect(err).ShouldNot(HaveOccurred()) - - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) - Describe("verify timeout", func() { It("of 2 seconds", func() { SkipIfRemote("service subcommand not supported remotely") diff --git a/test/e2e/systemd_activate_test.go b/test/e2e/systemd_activate_test.go index f6c9351c47..68c5314d6d 100644 --- a/test/e2e/systemd_activate_test.go +++ b/test/e2e/systemd_activate_test.go @@ -20,23 +20,11 @@ import ( ) var _ = Describe("Systemd activate", func() { - var tempDir string - var err error - var podmanTest *PodmanTestIntegration var activate string BeforeEach(func() { SkipIfRemote("Testing stopped service requires both podman and podman-remote binaries") - tempDir, err = testUtils.CreateTempDirInTempDir() - if err != nil { - GinkgoWriter.Printf("%v\n", err) - os.Exit(1) - } - - podmanTest = PodmanTestCreate(tempDir) - podmanTest.Setup() - activate, err = exec.LookPath("systemd-socket-activate") if err != nil { activate = "/usr/bin/systemd-socket-activate" @@ -52,12 +40,6 @@ var _ = Describe("Systemd activate", func() { } }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) - It("stop podman.service", func() { // systemd-socket-activate does not support DNS lookups host := "127.0.0.1" @@ -134,7 +116,7 @@ var _ = Describe("Systemd activate", func() { activateSession := testUtils.StartSystemExec(activate, []string{ "--datagram", "--listen", addr, podmanTest.PodmanBinary, - "--root=" + filepath.Join(tempDir, "server_root"), + "--root=" + filepath.Join(tempdir, "server_root"), "system", "service", "--time=0", }) diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index 3324f78780..1a38956997 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -13,20 +13,10 @@ import ( ) var _ = Describe("Podman systemd", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - systemdUnitFile string - ) + + var systemdUnitFile string BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() systemdUnitFile = fmt.Sprintf(`[Unit] Description=redis container [Service] @@ -39,13 +29,6 @@ WantedBy=default.target `, podmanTest.PodmanBinary, podmanTest.PodmanBinary) }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) - It("podman start container by systemd", func() { SkipIfRootless("rootless can not write to /etc") SkipIfContainerized("test does not have systemd as pid 1") diff --git a/test/e2e/tag_test.go b/test/e2e/tag_test.go index 596ae7433f..19b984ab23 100644 --- a/test/e2e/tag_test.go +++ b/test/e2e/tag_test.go @@ -1,38 +1,17 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman tag", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() podmanTest.AddImageToRWStore(ALPINE) }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) - It("podman tag shortname:latest", func() { session := podmanTest.Podman([]string{"tag", ALPINE, "foobar:latest"}) session.WaitWithDefaultTimeout() diff --git a/test/e2e/toolbox_test.go b/test/e2e/toolbox_test.go index edc1a96349..6deb7dee54 100644 --- a/test/e2e/toolbox_test.go +++ b/test/e2e/toolbox_test.go @@ -27,7 +27,6 @@ package integration import ( "fmt" - "os" "os/exec" "os/user" "path" @@ -42,26 +41,6 @@ import ( ) var _ = Describe("Toolbox-specific testing", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman run --dns=none - allows self-management of /etc/resolv.conf", func() { session := podmanTest.Podman([]string{"run", "--dns", "none", ALPINE, "sh", "-c", diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go index 287b545cf3..e56df5c3c4 100644 --- a/test/e2e/top_test.go +++ b/test/e2e/top_test.go @@ -4,34 +4,12 @@ import ( "os" "os/user" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman top", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman top without container name or id", func() { result := podmanTest.Podman([]string{"top"}) diff --git a/test/e2e/tree_test.go b/test/e2e/tree_test.go index 4b220053ce..52eae4511d 100644 --- a/test/e2e/tree_test.go +++ b/test/e2e/tree_test.go @@ -1,37 +1,17 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman image tree", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() podmanTest.AddImageToRWStore(BB) }) - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) - It("podman image tree", func() { SkipIfRemote("podman-image-tree is not supported for remote clients") podmanTest.AddImageToRWStore(CIRROS_IMAGE) diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go index 799359e2cf..fb6afd1c2a 100644 --- a/test/e2e/trust_test.go +++ b/test/e2e/trust_test.go @@ -12,28 +12,9 @@ import ( ) var _ = Describe("Podman trust", func() { - var ( - tempdir string - - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { SkipIfRemote("podman-remote does not support image trust") - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman image trust show", func() { diff --git a/test/e2e/unshare_test.go b/test/e2e/unshare_test.go index 7eb00bc629..3d4eff8c3e 100644 --- a/test/e2e/unshare_test.go +++ b/test/e2e/unshare_test.go @@ -3,7 +3,6 @@ package integration import ( "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" @@ -18,11 +17,6 @@ func cleanupRootlessSlirp4netns(p *PodmanTestIntegration) { } var _ = Describe("Podman unshare", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) BeforeEach(func() { if _, err := os.Stat("/proc/self/uid_map"); err != nil { Skip("User namespaces not supported.") @@ -31,21 +25,6 @@ var _ = Describe("Podman unshare", func() { if !isRootless() { Skip("Use unshare in rootless only") } - - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.CgroupManager = "cgroupfs" - podmanTest.StorageOptions = ROOTLESS_STORAGE_OPTIONS - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) }) It("podman unshare", func() { diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go index 6279cc0780..e0b0fe26f0 100644 --- a/test/e2e/untag_test.go +++ b/test/e2e/untag_test.go @@ -1,36 +1,12 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman untag", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman untag all", func() { podmanTest.AddImageToRWStore(CIRROS_IMAGE) diff --git a/test/e2e/update_test.go b/test/e2e/update_test.go index acb25b0261..ecff08d85c 100644 --- a/test/e2e/update_test.go +++ b/test/e2e/update_test.go @@ -2,32 +2,12 @@ package integration import ( "github.com/containers/common/pkg/cgroupv2" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman update", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - Expect(err).ToNot(HaveOccurred()) - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman update container all options v1", func() { SkipIfCgroupV2("testing flags that only work in cgroup v1") diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index 9b25efbf31..c946f0636a 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -2,9 +2,7 @@ package integration import ( "fmt" - "os" - . "github.com/containers/podman/v4/test/utils" "github.com/containers/podman/v4/version" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -12,26 +10,6 @@ import ( ) var _ = Describe("Podman version", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman version", func() { session := podmanTest.Podman([]string{"version"}) diff --git a/test/e2e/volume_create_test.go b/test/e2e/volume_create_test.go index 50b56c2b91..c9259d06ed 100644 --- a/test/e2e/volume_create_test.go +++ b/test/e2e/volume_create_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" "path/filepath" . "github.com/containers/podman/v4/test/utils" @@ -12,26 +11,9 @@ import ( ) var _ = Describe("Podman volume create", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman create volume", func() { diff --git a/test/e2e/volume_exists_test.go b/test/e2e/volume_exists_test.go index eb200700c5..d0bc25efc2 100644 --- a/test/e2e/volume_exists_test.go +++ b/test/e2e/volume_exists_test.go @@ -1,9 +1,6 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -11,26 +8,9 @@ import ( ) var _ = Describe("Podman volume exists", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman volume exists", func() { diff --git a/test/e2e/volume_inspect_test.go b/test/e2e/volume_inspect_test.go index 903133573f..3cf64fe12d 100644 --- a/test/e2e/volume_inspect_test.go +++ b/test/e2e/volume_inspect_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,26 +8,9 @@ import ( ) var _ = Describe("Podman volume inspect", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman inspect volume", func() { diff --git a/test/e2e/volume_ls_test.go b/test/e2e/volume_ls_test.go index 2889af14aa..0d6a9599fe 100644 --- a/test/e2e/volume_ls_test.go +++ b/test/e2e/volume_ls_test.go @@ -2,7 +2,6 @@ package integration import ( "fmt" - "os" . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" @@ -11,26 +10,9 @@ import ( ) var _ = Describe("Podman volume ls", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman ls volume", func() { diff --git a/test/e2e/volume_plugin_test.go b/test/e2e/volume_plugin_test.go index 5d6d6a7971..15c17293ad 100644 --- a/test/e2e/volume_plugin_test.go +++ b/test/e2e/volume_plugin_test.go @@ -13,19 +13,7 @@ import ( ) var _ = Describe("Podman volume plugins", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() os.Setenv("CONTAINERS_CONF", "config/containers.conf") SkipIfRemote("Volume plugins only supported as local") SkipIfRootless("Root is required for volume plugin testing") @@ -35,9 +23,6 @@ var _ = Describe("Podman volume plugins", func() { AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentSpecReport() - processTestResult(f) - os.Unsetenv("CONTAINERS_CONF") }) It("volume create with nonexistent plugin errors", func() { diff --git a/test/e2e/volume_prune_test.go b/test/e2e/volume_prune_test.go index 35a1d7fe25..7089277c1c 100644 --- a/test/e2e/volume_prune_test.go +++ b/test/e2e/volume_prune_test.go @@ -1,35 +1,15 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman volume prune", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman prune volume", func() { diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go index ae6f4e4f59..e3d50b5644 100644 --- a/test/e2e/volume_rm_test.go +++ b/test/e2e/volume_rm_test.go @@ -1,8 +1,6 @@ package integration import ( - "os" - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -10,26 +8,9 @@ import ( ) var _ = Describe("Podman volume rm", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) AfterEach(func() { podmanTest.CleanupVolume() - f := CurrentSpecReport() - processTestResult(f) - }) It("podman volume rm", func() { diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go index b778f12527..28dc35dd5f 100644 --- a/test/e2e/wait_test.go +++ b/test/e2e/wait_test.go @@ -1,36 +1,12 @@ package integration import ( - "os" - - . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" ) var _ = Describe("Podman wait", func() { - var ( - tempdir string - err error - podmanTest *PodmanTestIntegration - ) - - BeforeEach(func() { - tempdir, err = CreateTempDirInTempDir() - if err != nil { - os.Exit(1) - } - podmanTest = PodmanTestCreate(tempdir) - podmanTest.Setup() - }) - - AfterEach(func() { - podmanTest.Cleanup() - f := CurrentSpecReport() - processTestResult(f) - - }) It("podman wait on bogus container", func() { session := podmanTest.Podman([]string{"wait", "1234"})