opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-04 10:10:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22314 from edsantiago/blow-a-fuse

Browse Source 
e2e tests: remove requirement for fuse-overlayfs
This commit is contained in:
openshift-merge-bot[bot]
2024-04-09 19:33:40 +00:00
committed by GitHub
parent 6f4b1c10a8 847ca1f9ea
commit 9fc46dfb67
2 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/info_test.go
View File

@ -83,10 +83,11 @@ var _ = Describe("Podman Info", func() {
rootlessStoragePath := `"/tmp/$HOME/$USER/$UID/storage"` rootlessStoragePath := `"/tmp/$HOME/$USER/$UID/storage"`
driver := `"overlay"` driver := `"overlay"`
storageOpt := `"/usr/bin/fuse-overlayfs"` storageConf := []byte(fmt.Sprintf("[storage]\ndriver=%s\nrootless_storage_path=%s\n[storage.options]\n", driver, rootlessStoragePath))
storageConf := []byte(fmt.Sprintf("[storage]\ndriver=%s\nrootless_storage_path=%s\n[storage.options]\nmount_program=%s", driver, rootlessStoragePath, storageOpt))
err = os.WriteFile(configPath, storageConf, os.ModePerm) err = os.WriteFile(configPath, storageConf, os.ModePerm)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
// Failures in this test are impossible to debug without breadcrumbs
GinkgoWriter.Printf("CONTAINERS_STORAGE_CONF=%s:\n%s\n", configPath, storageConf)
u, err := user.Current() u, err := user.Current()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
@ -96,8 +97,9 @@ var _ = Describe("Podman Info", func() {
podmanPath := podmanTest.PodmanTest.PodmanBinary podmanPath := podmanTest.PodmanTest.PodmanBinary
cmd := exec.Command(podmanPath, "info", "--format", "{{.Store.GraphRoot -}}") cmd := exec.Command(podmanPath, "info", "--format", "{{.Store.GraphRoot -}}")
out, err := cmd.CombinedOutput() out, err := cmd.CombinedOutput()
Expect(err).ToNot(HaveOccurred()) GinkgoWriter.Printf("Running: podman info --format {{.Store.GraphRoot -}}\nOutput: %s\n", string(out))
Expect(string(out)).To(Equal(expect)) Expect(err).ToNot(HaveOccurred(), "podman info")
Expect(string(out)).To(Equal(expect), "output from podman info")
}) })
It("check RemoteSocket ", func() { It("check RemoteSocket ", func() {

25
test/e2e/run_volume_test.go
View File

@ -201,11 +201,6 @@ var _ = Describe("Podman run with volumes", func() {
if os.Getenv("container") != "" { if os.Getenv("container") != "" {
Skip("Overlay mounts not supported when running in a container") Skip("Overlay mounts not supported when running in a container")
} }
if isRootless() {
if _, err := exec.LookPath("fuse-overlayfs"); err != nil {
Skip("Fuse-Overlayfs required for rootless overlay mount test")
}
}
mountPath := filepath.Join(podmanTest.TempDir, "secrets") mountPath := filepath.Join(podmanTest.TempDir, "secrets")
err := os.Mkdir(mountPath, 0755) err := os.Mkdir(mountPath, 0755)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
@ -221,11 +216,6 @@ var _ = Describe("Podman run with volumes", func() {
if os.Getenv("container") != "" { if os.Getenv("container") != "" {
Skip("Overlay mounts not supported when running in a container") Skip("Overlay mounts not supported when running in a container")
} }
if isRootless() {
if _, err := exec.LookPath("fuse-overlayfs"); err != nil {
Skip("Fuse-Overlayfs required for rootless overlay mount test")
}
}
session := podmanTest.Podman([]string{"volume", "create", "myvolume"}) session := podmanTest.Podman([]string{"volume", "create", "myvolume"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
volName := session.OutputToString() volName := session.OutputToString()
@ -254,11 +244,6 @@ var _ = Describe("Podman run with volumes", func() {
if os.Getenv("container") != "" { if os.Getenv("container") != "" {
Skip("Overlay mounts not supported when running in a container") Skip("Overlay mounts not supported when running in a container")
} }
if isRootless() {
if _, err := exec.LookPath("fuse-overlayfs"); err != nil {
Skip("Fuse-Overlayfs required for rootless overlay mount test")
}
}
// create persistent upperdir on host // create persistent upperdir on host
upperDir := filepath.Join(tempdir, "upper") upperDir := filepath.Join(tempdir, "upper")
@ -308,11 +293,6 @@ var _ = Describe("Podman run with volumes", func() {
if os.Getenv("container") != "" { if os.Getenv("container") != "" {
Skip("Overlay mounts not supported when running in a container") Skip("Overlay mounts not supported when running in a container")
} }
if isRootless() {
if _, err := exec.LookPath("fuse-overlayfs"); err != nil {
Skip("Fuse-Overlayfs required for rootless overlay mount test")
}
}
// Use bindsource instead of named volume // Use bindsource instead of named volume
bindSource := filepath.Join(tempdir, "bindsource") bindSource := filepath.Join(tempdir, "bindsource")
@ -626,11 +606,6 @@ VOLUME /test/`, ALPINE)
if os.Getenv("container") != "" { if os.Getenv("container") != "" {
Skip("Overlay mounts not supported when running in a container") Skip("Overlay mounts not supported when running in a container")
} }
if isRootless() {
if _, err := exec.LookPath("fuse-overlayfs"); err != nil {
Skip("Fuse-Overlayfs required for rootless overlay mount test")
}
}
mountPath := filepath.Join(podmanTest.TempDir, "secrets") mountPath := filepath.Join(podmanTest.TempDir, "secrets")
err := os.Mkdir(mountPath, 0755) err := os.Mkdir(mountPath, 0755)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())