opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 12:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17739 from giuseppe/reenable-test

Browse Source 
test: reenable idmap test
This commit is contained in:
OpenShift Merge Robot
2023-03-13 15:22:27 -04:00
committed by GitHub
parent 3920799553 fb4f6f95c5
commit 519cfa81f6
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/common_test.go
View File

@ -727,6 +727,13 @@ func SkipIfNotSystemd(manager, reason string) {
} }
} }
func SkipOnOSVersion(os, version string) {
info := GetHostDistributionInfo()
if info.Distribution == os && info.Version == version {
Skip(fmt.Sprintf("Test doesn't work on %s %s", os, version))
}
}
func SkipIfNotFedora() { func SkipIfNotFedora() {
info := GetHostDistributionInfo() info := GetHostDistributionInfo()
if info.Distribution != "fedora" { if info.Distribution != "fedora" {

5
test/e2e/run_userns_test.go
View File

@ -109,13 +109,16 @@ var _ = Describe("Podman UserNS support", func() {
}) })
It("podman uidmapping and gidmapping with an idmapped volume", func() { It("podman uidmapping and gidmapping with an idmapped volume", func() {
Skip("it depends on a breaking change in crun: https://github.com/containers/crun/pull/1147")
SkipIfRunc(podmanTest, "Test not supported yet with runc, see issue #17433") SkipIfRunc(podmanTest, "Test not supported yet with runc, see issue #17433")
SkipOnOSVersion("fedora", "36")
session := podmanTest.Podman([]string{"run", "--uidmap=0:1:500", "--gidmap=0:200:5000", "-v", "my-foo-volume:/foo:Z,idmap", "alpine", "stat", "-c", "#%u:%g#", "/foo"}) session := podmanTest.Podman([]string{"run", "--uidmap=0:1:500", "--gidmap=0:200:5000", "-v", "my-foo-volume:/foo:Z,idmap", "alpine", "stat", "-c", "#%u:%g#", "/foo"})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
if strings.Contains(session.ErrorToString(), "Operation not permitted") { if strings.Contains(session.ErrorToString(), "Operation not permitted") {
Skip("not sufficiently privileged") Skip("not sufficiently privileged")
} }
if strings.Contains(session.ErrorToString(), "Invalid argument") {
Skip("the file system doesn't support idmapped mounts")
}
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(ContainSubstring("#0:0#")) Expect(session.OutputToString()).To(ContainSubstring("#0:0#"))
}) })