diff options
Diffstat (limited to 'test')
131 files changed, 201 insertions, 172 deletions
diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at index 3d67650d2..72003984f 100644 --- a/test/apiv2/20-containers.at +++ b/test/apiv2/20-containers.at @@ -156,7 +156,7 @@ podman create -t -i --name myctr $IMAGE ls # Check configuration before initializing t GET libpod/containers/myctr/json 200 \ .Id~[0-9a-f]\\{64\\} \ - .State.Status="configured" \ + .State.Status="created" \ .State.Pid=0 \ .ResolvConfPath="" \ .HostnamePath="" \ @@ -172,7 +172,7 @@ t POST libpod/containers/myctr/init 204 # Check configuration after initializing t GET libpod/containers/myctr/json 200 \ .Id~[0-9a-f]\\{64\\} \ - .State.Status="created" \ + .State.Status="initialized" \ .State.Pid~[0-9]\\{1\,8\\} \ .ResolvConfPath=$userdata_path/resolv.conf \ .HostnamePath=$userdata_path/hostname \ diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go index 5843462f2..a7af76529 100644 --- a/test/e2e/attach_test.go +++ b/test/e2e/attach_test.go @@ -5,7 +5,7 @@ import ( "syscall" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/build_test.go b/test/e2e/build_test.go index c05dc6f3f..5dabe728a 100644 --- a/test/e2e/build_test.go +++ b/test/e2e/build_test.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/containers/buildah" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go index 4771f8e58..5f1e4b1d1 100644 --- a/test/e2e/checkpoint_test.go +++ b/test/e2e/checkpoint_test.go @@ -11,11 +11,11 @@ import ( "time" "github.com/checkpoint-restore/go-criu/v5/stats" - "github.com/containers/podman/v3/pkg/checkpoint/crutils" - "github.com/containers/podman/v3/pkg/criu" - "github.com/containers/podman/v3/pkg/domain/entities" - . "github.com/containers/podman/v3/test/utils" - "github.com/containers/podman/v3/utils" + "github.com/containers/podman/v4/pkg/checkpoint/crutils" + "github.com/containers/podman/v4/pkg/criu" + "github.com/containers/podman/v4/pkg/domain/entities" + . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v4/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go index d9411b146..495e31520 100644 --- a/test/e2e/commit_test.go +++ b/test/e2e/commit_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index bd744aa78..64f40d2ed 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -16,10 +16,10 @@ import ( "time" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/inspect" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/inspect" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage" "github.com/containers/storage/pkg/reexec" "github.com/containers/storage/pkg/stringid" diff --git a/test/e2e/container_create_volume_test.go b/test/e2e/container_create_volume_test.go index df1d9a371..62a2541b9 100644 --- a/test/e2e/container_create_volume_test.go +++ b/test/e2e/container_create_volume_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/container_inspect_test.go b/test/e2e/container_inspect_test.go index 597eeb1a4..f58f2de29 100644 --- a/test/e2e/container_inspect_test.go +++ b/test/e2e/container_inspect_test.go @@ -3,9 +3,9 @@ package integration import ( "os" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/annotations" - . "github.com/containers/podman/v3/test/utils" + "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" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index d6bf66a50..57279ae9c 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go index 70b559222..ede6036b9 100644 --- a/test/e2e/cp_test.go +++ b/test/e2e/cp_test.go @@ -7,7 +7,7 @@ import ( "os/user" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/create_staticip_test.go b/test/e2e/create_staticip_test.go index ded4c03e0..5d234d717 100644 --- a/test/e2e/create_staticip_test.go +++ b/test/e2e/create_staticip_test.go @@ -4,8 +4,8 @@ import ( "os" "time" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/create_staticmac_test.go b/test/e2e/create_staticmac_test.go index 7cb638e47..c6694ff7f 100644 --- a/test/e2e/create_staticmac_test.go +++ b/test/e2e/create_staticmac_test.go @@ -3,8 +3,8 @@ package integration import ( "os" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/create_test.go b/test/e2e/create_test.go index a482c0068..addf0ded0 100644 --- a/test/e2e/create_test.go +++ b/test/e2e/create_test.go @@ -8,7 +8,7 @@ import ( "runtime" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index a872a9713..fb6df8f45 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -5,7 +5,7 @@ import ( "os" "sort" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/events_test.go b/test/e2e/events_test.go index 3b5b8ac6c..1d4560e8e 100644 --- a/test/e2e/events_test.go +++ b/test/e2e/events_test.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/containers/podman/v3/libpod/events" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/events" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 121d0b234..3987746d0 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/exists_test.go b/test/e2e/exists_test.go index 260b6d5f2..9dde46478 100644 --- a/test/e2e/exists_test.go +++ b/test/e2e/exists_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/export_test.go b/test/e2e/export_test.go index a9dd09d8e..78811f1b5 100644 --- a/test/e2e/export_test.go +++ b/test/e2e/export_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go index 16f2c4272..53829e89b 100644 --- a/test/e2e/generate_kube_test.go +++ b/test/e2e/generate_kube_test.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v4/libpod/define" - "github.com/containers/podman/v3/pkg/util" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/util" + . "github.com/containers/podman/v4/test/utils" "github.com/ghodss/yaml" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go index fd9ae5037..976048886 100644 --- a/test/e2e/generate_systemd_test.go +++ b/test/e2e/generate_systemd_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go index 6a79006b6..c84488145 100644 --- a/test/e2e/healthcheck_run_test.go +++ b/test/e2e/healthcheck_run_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "time" - define "github.com/containers/podman/v3/libpod/define" - . "github.com/containers/podman/v3/test/utils" + define "github.com/containers/podman/v4/libpod/define" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/history_test.go b/test/e2e/history_test.go index c6e9579ae..92e0e1b08 100644 --- a/test/e2e/history_test.go +++ b/test/e2e/history_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/image_scp_test.go b/test/e2e/image_scp_test.go index 767b355d9..5abdf74f8 100644 --- a/test/e2e/image_scp_test.go +++ b/test/e2e/image_scp_test.go @@ -5,7 +5,7 @@ import ( "os" "github.com/containers/common/pkg/config" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/image_sign_test.go b/test/e2e/image_sign_test.go index 09e156e02..dbf697bb0 100644 --- a/test/e2e/image_sign_test.go +++ b/test/e2e/image_sign_test.go @@ -6,7 +6,7 @@ import ( "os/exec" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index a3cc1ce99..0a4d9b134 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/docker/go-units" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/import_test.go b/test/e2e/import_test.go index 87aa7d438..884eae18e 100644 --- a/test/e2e/import_test.go +++ b/test/e2e/import_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/info_test.go b/test/e2e/info_test.go index bc3ae4443..f989a9d29 100644 --- a/test/e2e/info_test.go +++ b/test/e2e/info_test.go @@ -8,7 +8,7 @@ import ( "os/user" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/init_test.go b/test/e2e/init_test.go index 788b67154..c4c090daf 100644 --- a/test/e2e/init_test.go +++ b/test/e2e/init_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" @@ -57,7 +57,7 @@ var _ = Describe("Podman init", func() { result.WaitWithDefaultTimeout() Expect(result).Should(Exit(0)) conData := result.InspectContainerToJSON() - Expect(conData[0].State.Status).To(Equal("created")) + Expect(conData[0].State.Status).To(Equal("initialized")) }) It("podman init single container by name", func() { @@ -72,7 +72,7 @@ var _ = Describe("Podman init", func() { result.WaitWithDefaultTimeout() Expect(result).Should(Exit(0)) conData := result.InspectContainerToJSON() - Expect(conData[0].State.Status).To(Equal("created")) + Expect(conData[0].State.Status).To(Equal("initialized")) }) It("podman init latest container", func() { @@ -87,7 +87,7 @@ var _ = Describe("Podman init", func() { result.WaitWithDefaultTimeout() Expect(result).Should(Exit(0)) conData := result.InspectContainerToJSON() - Expect(conData[0].State.Status).To(Equal("created")) + Expect(conData[0].State.Status).To(Equal("initialized")) }) It("podman init all three containers, one running", func() { @@ -107,12 +107,12 @@ var _ = Describe("Podman init", func() { result.WaitWithDefaultTimeout() Expect(result).Should(Exit(0)) conData := result.InspectContainerToJSON() - Expect(conData[0].State.Status).To(Equal("created")) + Expect(conData[0].State.Status).To(Equal("initialized")) result2 := podmanTest.Podman([]string{"inspect", "test2"}) result2.WaitWithDefaultTimeout() Expect(result2).Should(Exit(0)) conData2 := result2.InspectContainerToJSON() - Expect(conData2[0].State.Status).To(Equal("created")) + Expect(conData2[0].State.Status).To(Equal("initialized")) result3 := podmanTest.Podman([]string{"inspect", "test3"}) result3.WaitWithDefaultTimeout() Expect(result3).Should(Exit(0)) diff --git a/test/e2e/inspect_test.go b/test/e2e/inspect_test.go index 127e26b11..3943a5e87 100644 --- a/test/e2e/inspect_test.go +++ b/test/e2e/inspect_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/kill_test.go b/test/e2e/kill_test.go index 266146bd2..552a7c15d 100644 --- a/test/e2e/kill_test.go +++ b/test/e2e/kill_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go index 53e1fc8f2..37381a561 100644 --- a/test/e2e/libpod_suite_remote_test.go +++ b/test/e2e/libpod_suite_remote_test.go @@ -16,7 +16,7 @@ import ( "syscall" "time" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/pkg/rootless" ) func IsRemote() bool { diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 4147ba2c3..ccd7c771e 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v3/pkg/rootless" + "github.com/containers/podman/v4/pkg/rootless" ) func IsRemote() bool { diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go index ac70ebd8c..8e9f0ad13 100644 --- a/test/e2e/load_test.go +++ b/test/e2e/load_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/login_logout_test.go b/test/e2e/login_logout_test.go index d8ca9cbd9..3d0f44dc1 100644 --- a/test/e2e/login_logout_test.go +++ b/test/e2e/login_logout_test.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" "github.com/onsi/ginkgo/config" . "github.com/onsi/gomega" diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index dc00491cd..7c0fcc8ee 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -7,7 +7,7 @@ import ( "strings" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go index b86d5ecbe..eaa9cdae6 100644 --- a/test/e2e/manifest_test.go +++ b/test/e2e/manifest_test.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/mount_rootless_test.go b/test/e2e/mount_rootless_test.go index b66826b31..30d7ce8a9 100644 --- a/test/e2e/mount_rootless_test.go +++ b/test/e2e/mount_rootless_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go index cd7f73337..2434e8008 100644 --- a/test/e2e/mount_test.go +++ b/test/e2e/mount_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/namespace_test.go b/test/e2e/namespace_test.go index 43edee1a5..c3e0e2d23 100644 --- a/test/e2e/namespace_test.go +++ b/test/e2e/namespace_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/negative_test.go b/test/e2e/negative_test.go index c3cef2e8e..b8b8df86e 100644 --- a/test/e2e/negative_test.go +++ b/test/e2e/negative_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/test/e2e/network_connect_disconnect_test.go b/test/e2e/network_connect_disconnect_test.go index 23281fe05..82b9dcd09 100644 --- a/test/e2e/network_connect_disconnect_test.go +++ b/test/e2e/network_connect_disconnect_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/network_create_test.go b/test/e2e/network_create_test.go index 194510f32..ade78a308 100644 --- a/test/e2e/network_create_test.go +++ b/test/e2e/network_create_test.go @@ -6,7 +6,7 @@ import ( "os" "github.com/containers/common/libnetwork/types" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/network_test.go b/test/e2e/network_test.go index 1c99d0f36..877ad37b8 100644 --- a/test/e2e/network_test.go +++ b/test/e2e/network_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/containers/common/libnetwork/types" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/pause_test.go b/test/e2e/pause_test.go index c9182960a..66638d71c 100644 --- a/test/e2e/pause_test.go +++ b/test/e2e/pause_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/play_build_test.go b/test/e2e/play_build_test.go index a56560634..bbebf7949 100644 --- a/test/e2e/play_build_test.go +++ b/test/e2e/play_build_test.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 71bfd1e99..63c9bf7f3 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -14,11 +14,11 @@ import ( "text/template" "time" - "github.com/containers/podman/v3/libpod/define" - "github.com/containers/podman/v3/pkg/bindings" - "github.com/containers/podman/v3/pkg/bindings/play" - "github.com/containers/podman/v3/pkg/util" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/define" + "github.com/containers/podman/v4/pkg/bindings" + "github.com/containers/podman/v4/pkg/bindings/play" + "github.com/containers/podman/v4/pkg/util" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index 623377ea1..f0abfd80c 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -12,9 +12,9 @@ import ( "github.com/containers/common/pkg/apparmor" "github.com/containers/common/pkg/seccomp" "github.com/containers/common/pkg/sysinfo" - "github.com/containers/podman/v3/pkg/rootless" - "github.com/containers/podman/v3/pkg/util" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + "github.com/containers/podman/v4/pkg/util" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_infra_container_test.go b/test/e2e/pod_infra_container_test.go index f4b99bb6b..db366b612 100644 --- a/test/e2e/pod_infra_container_test.go +++ b/test/e2e/pod_infra_container_test.go @@ -4,7 +4,7 @@ import ( "os" "strconv" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_initcontainers_test.go b/test/e2e/pod_initcontainers_test.go index e73f28a7a..a99e24908 100644 --- a/test/e2e/pod_initcontainers_test.go +++ b/test/e2e/pod_initcontainers_test.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/containers/podman/v3/libpod/define" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/define" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_inspect_test.go b/test/e2e/pod_inspect_test.go index 0fc16b507..19a2772fd 100644 --- a/test/e2e/pod_inspect_test.go +++ b/test/e2e/pod_inspect_test.go @@ -4,8 +4,8 @@ import ( "encoding/json" "os" - "github.com/containers/podman/v3/libpod/define" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/define" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_kill_test.go b/test/e2e/pod_kill_test.go index 0bd9aa0f1..18f9769a1 100644 --- a/test/e2e/pod_kill_test.go +++ b/test/e2e/pod_kill_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_pause_test.go b/test/e2e/pod_pause_test.go index 7c092ba8e..57ae75926 100644 --- a/test/e2e/pod_pause_test.go +++ b/test/e2e/pod_pause_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" @@ -16,7 +16,7 @@ var _ = Describe("Podman pod pause", func() { podmanTest *PodmanTestIntegration ) - pausedState := "paused" + pausedState := "Paused" BeforeEach(func() { SkipIfRootlessCgroupsV1("Pause is not supported in cgroups v1") diff --git a/test/e2e/pod_pod_namespaces_test.go b/test/e2e/pod_pod_namespaces_test.go index 293fd02ae..667a54861 100644 --- a/test/e2e/pod_pod_namespaces_test.go +++ b/test/e2e/pod_pod_namespaces_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_prune_test.go b/test/e2e/pod_prune_test.go index 84348f30c..55ecc1593 100644 --- a/test/e2e/pod_prune_test.go +++ b/test/e2e/pod_prune_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_ps_test.go b/test/e2e/pod_ps_test.go index 281aea9a9..29ee73d35 100644 --- a/test/e2e/pod_ps_test.go +++ b/test/e2e/pod_ps_test.go @@ -5,7 +5,7 @@ import ( "os" "sort" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/pod_restart_test.go b/test/e2e/pod_restart_test.go index 448c110ce..1897104cc 100644 --- a/test/e2e/pod_restart_test.go +++ b/test/e2e/pod_restart_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_rm_test.go b/test/e2e/pod_rm_test.go index 636503a0c..7a0d97d28 100644 --- a/test/e2e/pod_rm_test.go +++ b/test/e2e/pod_rm_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_start_test.go b/test/e2e/pod_start_test.go index e895b5598..2f3ef3a11 100644 --- a/test/e2e/pod_start_test.go +++ b/test/e2e/pod_start_test.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_stats_test.go b/test/e2e/pod_stats_test.go index bb145088e..0e94406f8 100644 --- a/test/e2e/pod_stats_test.go +++ b/test/e2e/pod_stats_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_stop_test.go b/test/e2e/pod_stop_test.go index 27ac7d965..fc78f9ed6 100644 --- a/test/e2e/pod_stop_test.go +++ b/test/e2e/pod_stop_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/pod_top_test.go b/test/e2e/pod_top_test.go index 602546141..564170412 100644 --- a/test/e2e/pod_top_test.go +++ b/test/e2e/pod_top_test.go @@ -5,7 +5,7 @@ import ( "os" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/port_test.go b/test/e2e/port_test.go index 776687113..d81c03e5b 100644 --- a/test/e2e/port_test.go +++ b/test/e2e/port_test.go @@ -5,7 +5,7 @@ import ( "os" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/prune_test.go b/test/e2e/prune_test.go index 6a70fd556..01f987b92 100644 --- a/test/e2e/prune_test.go +++ b/test/e2e/prune_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/ps_test.go b/test/e2e/ps_test.go index a9f334f5c..0c93c430b 100644 --- a/test/e2e/ps_test.go +++ b/test/e2e/ps_test.go @@ -7,7 +7,7 @@ import ( "sort" "strconv" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" "github.com/docker/go-units" . "github.com/onsi/ginkgo" diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go index 38afff9bd..231869e8c 100644 --- a/test/e2e/pull_test.go +++ b/test/e2e/pull_test.go @@ -7,7 +7,7 @@ import ( "runtime" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index a3b5e31bb..a8a98fc07 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/archive" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/rename_test.go b/test/e2e/rename_test.go index e5e69c25c..c146eb410 100644 --- a/test/e2e/rename_test.go +++ b/test/e2e/rename_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/restart_test.go b/test/e2e/restart_test.go index f85a74f47..b8c74d395 100644 --- a/test/e2e/restart_test.go +++ b/test/e2e/restart_test.go @@ -4,7 +4,7 @@ import ( "os" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/rm_test.go b/test/e2e/rm_test.go index e355de42f..f836540b4 100644 --- a/test/e2e/rm_test.go +++ b/test/e2e/rm_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/rmi_test.go b/test/e2e/rmi_test.go index 658155587..cc3cceda5 100644 --- a/test/e2e/rmi_test.go +++ b/test/e2e/rmi_test.go @@ -5,7 +5,7 @@ import ( "os" "sync" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_apparmor_test.go b/test/e2e/run_apparmor_test.go index 6532402ed..e6526217a 100644 --- a/test/e2e/run_apparmor_test.go +++ b/test/e2e/run_apparmor_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "github.com/containers/common/pkg/apparmor" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_cgroup_parent_test.go b/test/e2e/run_cgroup_parent_test.go index 6bdc6af08..0aba367f3 100644 --- a/test/e2e/run_cgroup_parent_test.go +++ b/test/e2e/run_cgroup_parent_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go index cc4e66751..2282ef913 100644 --- a/test/e2e/run_cleanup_test.go +++ b/test/e2e/run_cleanup_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_cpu_test.go b/test/e2e/run_cpu_test.go index dc9c6820b..fda0a7c24 100644 --- a/test/e2e/run_cpu_test.go +++ b/test/e2e/run_cpu_test.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_device_test.go b/test/e2e/run_device_test.go index 4eb03dfff..b8bdc84f8 100644 --- a/test/e2e/run_device_test.go +++ b/test/e2e/run_device_test.go @@ -4,7 +4,7 @@ import ( "os" "os/exec" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go index 8b6d535e5..a313e8d40 100644 --- a/test/e2e/run_dns_test.go +++ b/test/e2e/run_dns_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go index 4fb6054e2..fde43dfec 100644 --- a/test/e2e/run_entrypoint_test.go +++ b/test/e2e/run_entrypoint_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_env_test.go b/test/e2e/run_env_test.go index f27f5eda7..f4c44c23b 100644 --- a/test/e2e/run_env_test.go +++ b/test/e2e/run_env_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_exit_test.go b/test/e2e/run_exit_test.go index 6c39e5a1f..aa9a4295c 100644 --- a/test/e2e/run_exit_test.go +++ b/test/e2e/run_exit_test.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/containers/podman/v3/libpod/define" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/libpod/define" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_memory_test.go b/test/e2e/run_memory_test.go index 04fac6bfb..d6a67da57 100644 --- a/test/e2e/run_memory_test.go +++ b/test/e2e/run_memory_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go index 42fdefabf..87b1f143e 100644 --- a/test/e2e/run_networking_test.go +++ b/test/e2e/run_networking_test.go @@ -5,7 +5,7 @@ import ( "os" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go index 7f4b58c0d..23fd298d7 100644 --- a/test/e2e/run_ns_test.go +++ b/test/e2e/run_ns_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_passwd_test.go b/test/e2e/run_passwd_test.go index 2207a50a8..4c97e665a 100644 --- a/test/e2e/run_passwd_test.go +++ b/test/e2e/run_passwd_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_privileged_test.go b/test/e2e/run_privileged_test.go index b894c7b1c..59223c589 100644 --- a/test/e2e/run_privileged_test.go +++ b/test/e2e/run_privileged_test.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_restart_test.go b/test/e2e/run_restart_test.go index 35768ca51..ec8fbfe98 100644 --- a/test/e2e/run_restart_test.go +++ b/test/e2e/run_restart_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_seccomp_test.go b/test/e2e/run_seccomp_test.go index 3a6adca0e..03212b6dc 100644 --- a/test/e2e/run_seccomp_test.go +++ b/test/e2e/run_seccomp_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_security_labels_test.go b/test/e2e/run_security_labels_test.go index 1da80e61d..8aebeaebb 100644 --- a/test/e2e/run_security_labels_test.go +++ b/test/e2e/run_security_labels_test.go @@ -5,7 +5,7 @@ import ( "os" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_selinux_test.go b/test/e2e/run_selinux_test.go index 5ae49a5c2..b71c68baf 100644 --- a/test/e2e/run_selinux_test.go +++ b/test/e2e/run_selinux_test.go @@ -4,7 +4,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go index 6bb325155..71efa770a 100644 --- a/test/e2e/run_signal_test.go +++ b/test/e2e/run_signal_test.go @@ -9,8 +9,8 @@ import ( "syscall" "time" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_staticip_test.go b/test/e2e/run_staticip_test.go index 2f3c3025a..cf014d46e 100644 --- a/test/e2e/run_staticip_test.go +++ b/test/e2e/run_staticip_test.go @@ -6,7 +6,7 @@ import ( "os" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index b461594c1..62a454e29 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -13,8 +13,8 @@ import ( "time" "github.com/containers/common/pkg/cgroups" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" "github.com/mrunalp/fileutils" . "github.com/onsi/ginkgo" diff --git a/test/e2e/run_userns_test.go b/test/e2e/run_userns_test.go index c1645af06..5a046b0a4 100644 --- a/test/e2e/run_userns_test.go +++ b/test/e2e/run_userns_test.go @@ -7,7 +7,7 @@ import ( "os/user" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" @@ -301,5 +301,34 @@ var _ = Describe("Podman UserNS support", func() { Expect(inspectGID).Should(Exit(0)) Expect(inspectGID.OutputToString()).To(Equal(tt.gid)) } + + }) + It("podman PODMAN_USERNS", func() { + SkipIfNotRootless("keep-id only works in rootless mode") + + podmanUserns, podmanUserusSet := os.LookupEnv("PODMAN_USERNS") + os.Setenv("PODMAN_USERNS", "keep-id") + defer func() { + if podmanUserusSet { + os.Setenv("PODMAN_USERNS", podmanUserns) + } else { + os.Unsetenv("PODMAN_USERNS") + } + }() + if IsRemote() { + podmanTest.RestartRemoteService() + } + + result := podmanTest.Podman([]string{"create", ALPINE, "true"}) + result.WaitWithDefaultTimeout() + Expect(result).Should(Exit(0)) + + inspect := podmanTest.Podman([]string{"inspect", "--format", "{{ .HostConfig.IDMappings }}", result.OutputToString()}) + inspect.WaitWithDefaultTimeout() + Expect(inspect.OutputToString()).To(Not(Equal("<nil>"))) + + if IsRemote() { + podmanTest.RestartRemoteService() + } }) }) diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go index c2817c551..00faf8089 100644 --- a/test/e2e/run_volume_test.go +++ b/test/e2e/run_volume_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/run_working_dir_test.go b/test/e2e/run_working_dir_test.go index bcc85dd9b..50d0a2194 100644 --- a/test/e2e/run_working_dir_test.go +++ b/test/e2e/run_working_dir_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go index 36c1f856c..d1e11dd9a 100644 --- a/test/e2e/runlabel_test.go +++ b/test/e2e/runlabel_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go index d17566e8f..39295608e 100644 --- a/test/e2e/save_test.go +++ b/test/e2e/save_test.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go index 24272aae5..f8d6019b0 100644 --- a/test/e2e/search_test.go +++ b/test/e2e/search_test.go @@ -9,8 +9,8 @@ import ( "strconv" "text/template" - "github.com/containers/podman/v3/pkg/domain/entities" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/domain/entities" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/secret_test.go b/test/e2e/secret_test.go index f08638b1b..90d760c81 100644 --- a/test/e2e/secret_test.go +++ b/test/e2e/secret_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/start_test.go b/test/e2e/start_test.go index 073631ef7..98943c6fc 100644 --- a/test/e2e/start_test.go +++ b/test/e2e/start_test.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/stats_test.go b/test/e2e/stats_test.go index 83a4896d5..8788369eb 100644 --- a/test/e2e/stats_test.go +++ b/test/e2e/stats_test.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go index fb8f92e0f..99d7f278c 100644 --- a/test/e2e/stop_test.go +++ b/test/e2e/stop_test.go @@ -5,7 +5,7 @@ import ( "os" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/system_connection_test.go b/test/e2e/system_connection_test.go index 95c2fe5b6..ac4c5e5ea 100644 --- a/test/e2e/system_connection_test.go +++ b/test/e2e/system_connection_test.go @@ -10,7 +10,7 @@ import ( "path/filepath" "github.com/containers/common/pkg/config" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gbytes" diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go index acb6530cf..2d75316ad 100644 --- a/test/e2e/system_df_test.go +++ b/test/e2e/system_df_test.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/system_dial_stdio_test.go b/test/e2e/system_dial_stdio_test.go index afe3d5acd..5fcb20cb8 100644 --- a/test/e2e/system_dial_stdio_test.go +++ b/test/e2e/system_dial_stdio_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/system_reset_test.go b/test/e2e/system_reset_test.go index 812e98cfd..641f98c38 100644 --- a/test/e2e/system_reset_test.go +++ b/test/e2e/system_reset_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/system_service_test.go b/test/e2e/system_service_test.go index a9ed0b11f..dcf5e03b2 100644 --- a/test/e2e/system_service_test.go +++ b/test/e2e/system_service_test.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - . "github.com/containers/podman/v3/test/utils" - "github.com/containers/podman/v3/utils" + . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v4/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index 1f237fc9e..f8d8db592 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -5,7 +5,7 @@ import ( "os" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/tag_test.go b/test/e2e/tag_test.go index 743f58ea2..52ed8a820 100644 --- a/test/e2e/tag_test.go +++ b/test/e2e/tag_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/toolbox_test.go b/test/e2e/toolbox_test.go index 72ada5c31..b34fd299c 100644 --- a/test/e2e/toolbox_test.go +++ b/test/e2e/toolbox_test.go @@ -35,8 +35,8 @@ import ( "strings" "syscall" - "github.com/containers/podman/v3/pkg/rootless" - . "github.com/containers/podman/v3/test/utils" + "github.com/containers/podman/v4/pkg/rootless" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/top_test.go b/test/e2e/top_test.go index 1a71ebf33..344568da5 100644 --- a/test/e2e/top_test.go +++ b/test/e2e/top_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/tree_test.go b/test/e2e/tree_test.go index 492dc50b2..ab6e49e88 100644 --- a/test/e2e/tree_test.go +++ b/test/e2e/tree_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/trust_test.go b/test/e2e/trust_test.go index 9909c0653..251fdbf77 100644 --- a/test/e2e/trust_test.go +++ b/test/e2e/trust_test.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/unshare_test.go b/test/e2e/unshare_test.go index cf1b8db53..ac4fa46bf 100644 --- a/test/e2e/unshare_test.go +++ b/test/e2e/unshare_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/untag_test.go b/test/e2e/untag_test.go index b247ad5da..90b0cc95f 100644 --- a/test/e2e/untag_test.go +++ b/test/e2e/untag_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/version_test.go b/test/e2e/version_test.go index 9398248b8..6f93beff6 100644 --- a/test/e2e/version_test.go +++ b/test/e2e/version_test.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" - "github.com/containers/podman/v3/version" + . "github.com/containers/podman/v4/test/utils" + "github.com/containers/podman/v4/version" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_create_test.go b/test/e2e/volume_create_test.go index bd609943c..966bc932a 100644 --- a/test/e2e/volume_create_test.go +++ b/test/e2e/volume_create_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_exists_test.go b/test/e2e/volume_exists_test.go index 2118eb307..fdadbda27 100644 --- a/test/e2e/volume_exists_test.go +++ b/test/e2e/volume_exists_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" "github.com/containers/storage/pkg/stringid" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/test/e2e/volume_inspect_test.go b/test/e2e/volume_inspect_test.go index 3fcdb7728..5e3edfe24 100644 --- a/test/e2e/volume_inspect_test.go +++ b/test/e2e/volume_inspect_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_ls_test.go b/test/e2e/volume_ls_test.go index 52b805718..ce4cfc77d 100644 --- a/test/e2e/volume_ls_test.go +++ b/test/e2e/volume_ls_test.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_plugin_test.go b/test/e2e/volume_plugin_test.go index a3a445866..959a44bb8 100644 --- a/test/e2e/volume_plugin_test.go +++ b/test/e2e/volume_plugin_test.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_prune_test.go b/test/e2e/volume_prune_test.go index 9ea8b1d25..0b4c30a48 100644 --- a/test/e2e/volume_prune_test.go +++ b/test/e2e/volume_prune_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/volume_rm_test.go b/test/e2e/volume_rm_test.go index 68d94963a..2a2de0920 100644 --- a/test/e2e/volume_rm_test.go +++ b/test/e2e/volume_rm_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go index 96bc8dbde..098780c70 100644 --- a/test/e2e/wait_test.go +++ b/test/e2e/wait_test.go @@ -3,7 +3,7 @@ package integration import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" diff --git a/test/system/040-ps.bats b/test/system/040-ps.bats index 61b290415..8d0a405d2 100644 --- a/test/system/040-ps.bats +++ b/test/system/040-ps.bats @@ -110,7 +110,7 @@ EOF run_podman ps --external is "${#lines[@]}" "3" "podman ps -a --external sees buildah containers" is "${lines[1]}" \ - "[0-9a-f]\{12\} \+$IMAGE *buildah .* seconds ago .* storage .* ${PODMAN_TEST_IMAGE_NAME}-working-container" \ + "[0-9a-f]\{12\} \+$IMAGE *buildah .* seconds ago .* Storage .* ${PODMAN_TEST_IMAGE_NAME}-working-container" \ "podman ps --external" # 'rm -a' should be a NOP diff --git a/test/system/080-pause.bats b/test/system/080-pause.bats index 57f390a74..deaf8d831 100644 --- a/test/system/080-pause.bats +++ b/test/system/080-pause.bats @@ -27,7 +27,7 @@ load helpers is "$output" "paused" "podman inspect .State.Status" sleep 3 run_podman ps -a --format '{{.ID}} {{.Names}} {{.Status}}' - is "$output" "${cid:0:12} $cname paused" "podman ps on paused container" + is "$output" "${cid:0:12} $cname Paused" "podman ps on paused container" run_podman unpause $cname run_podman ps -a --format '{{.ID}} {{.Names}} {{.Status}}' is "$output" "${cid:0:12} $cname Up .*" "podman ps on resumed container" diff --git a/test/upgrade/test-upgrade.bats b/test/upgrade/test-upgrade.bats index 5d2435ab9..58e4fe0a3 100644 --- a/test/upgrade/test-upgrade.bats +++ b/test/upgrade/test-upgrade.bats @@ -223,7 +223,7 @@ EOF @test "inspect - all container status" { tests=" running | running | 0 -created | configured | 0 +created | created | 0 done | exited | 0 failed | exited | 17 " diff --git a/test/utils/common_function_test.go b/test/utils/common_function_test.go index c996a302c..810d9f2a5 100644 --- a/test/utils/common_function_test.go +++ b/test/utils/common_function_test.go @@ -8,7 +8,7 @@ import ( "reflect" "strings" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" . "github.com/onsi/gomega" diff --git a/test/utils/podmansession_test.go b/test/utils/podmansession_test.go index d85f27bbb..5cfa30a53 100644 --- a/test/utils/podmansession_test.go +++ b/test/utils/podmansession_test.go @@ -1,7 +1,7 @@ package utils_test import ( - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/test/utils/podmantest_test.go b/test/utils/podmantest_test.go index 1bb9ecb6b..a9b5aef1f 100644 --- a/test/utils/podmantest_test.go +++ b/test/utils/podmantest_test.go @@ -3,7 +3,7 @@ package utils_test import ( "os" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/test/utils/utils_suite_test.go b/test/utils/utils_suite_test.go index d5f9cbce4..7478c12b9 100644 --- a/test/utils/utils_suite_test.go +++ b/test/utils/utils_suite_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - . "github.com/containers/podman/v3/test/utils" + . "github.com/containers/podman/v4/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gexec" diff --git a/test/version/main.go b/test/version/main.go index 2a751de78..8f2904405 100644 --- a/test/version/main.go +++ b/test/version/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/containers/podman/v3/version" + "github.com/containers/podman/v4/version" ) func main() { |