containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: drop unmount for overlay 

The unmount for the driver home dir is done automatically by the store
on Shutdown.  Do not do the unmount from the tests cleanup.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2024-07-14 15:05:38 +02:00
parent e16e528f39
commit b08b630c84
No known key found for this signature in database
GPG Key ID: 67E38F7A8BA21772
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/common_test.go
View File

@ -33,7 +33,6 @@ import (
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
. "github.com/onsi/gomega/gexec" . "github.com/onsi/gomega/gexec"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
) )
var ( var (
@ -1057,16 +1056,6 @@ func rmAll(podmanBin string, path string) {
GinkgoWriter.Printf("%v\n", err) GinkgoWriter.Printf("%v\n", err)
} }
} else { } else {
// When using overlay as root, podman leaves a stray mount behind.
// This leak causes remote tests to take a loooooong time, which
// then causes Cirrus to time out. Unmount that stray.
overlayPath := path + "/root/overlay"
if _, err := os.Stat(overlayPath); err == nil {
if err = unix.Unmount(overlayPath, unix.MNT_DETACH); err != nil {
GinkgoWriter.Printf("Error unmounting %s: %v\n", overlayPath, err)
}
}
if err = os.RemoveAll(path); err != nil { if err = os.RemoveAll(path); err != nil {
GinkgoWriter.Printf("%q\n", err) GinkgoWriter.Printf("%q\n", err)
} }