summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-05-11 15:12:42 +0200
committerGitHub <noreply@github.com>2020-05-11 15:12:42 +0200
commit01f747fdc3b601492d496536ced1386172c4e3d8 (patch)
tree8e4c6e73a039aaaea875a81112cb1670c1e8bb5c
parent6a26caf6bf09c5481e14af56bf3e96852bac2680 (diff)
parente4ab0cfbc6a35d4d99f79f27971671532a90307a (diff)
downloadpodman-01f747fdc3b601492d496536ced1386172c4e3d8.tar.gz
podman-01f747fdc3b601492d496536ced1386172c4e3d8.tar.bz2
podman-01f747fdc3b601492d496536ced1386172c4e3d8.zip
Merge pull request #6168 from vrothberg/mount-tests
enable rootless mount tests
-rw-r--r--cmd/podman/containers/unmount.go3
-rw-r--r--test/e2e/mount_test.go1
2 files changed, 0 insertions, 4 deletions
diff --git a/cmd/podman/containers/unmount.go b/cmd/podman/containers/unmount.go
index d0ca202fe..c8e551e28 100644
--- a/cmd/podman/containers/unmount.go
+++ b/cmd/podman/containers/unmount.go
@@ -27,9 +27,6 @@ var (
Args: func(cmd *cobra.Command, args []string) error {
return parse.CheckAllLatestAndCIDFile(cmd, args, false, false)
},
- Annotations: map[string]string{
- registry.ParentNSRequired: "",
- },
Example: `podman umount ctrID
podman umount ctrID1 ctrID2 ctrID3
podman umount --all`,
diff --git a/test/e2e/mount_test.go b/test/e2e/mount_test.go
index bb1e129db..ac52d8c7e 100644
--- a/test/e2e/mount_test.go
+++ b/test/e2e/mount_test.go
@@ -18,7 +18,6 @@ var _ = Describe("Podman mount", func() {
)
BeforeEach(func() {
- SkipIfRootlessV2()
tempdir, err = CreateTempDirInTempDir()
if err != nil {
os.Exit(1)