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

e2e: adapt play kube test on remote rootless

Browse Source 
Use podmanTest.PodmanBinary because podman-remote unshare
cannot be used.

Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
This commit is contained in:
Toshiki Sonoda
2023-02-07 16:50:01 +09:00
parent dcbe0182a9
commit 315215020d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/play_kube_test.go
View File

@ -4396,10 +4396,12 @@ ENV OPENJ9_JAVA_OPTIONS=%q
initialUsernsConfig, err := os.ReadFile("/proc/self/uid_map") initialUsernsConfig, err := os.ReadFile("/proc/self/uid_map")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
if isRootless() { if isRootless() {
unshare := podmanTest.Podman([]string{"unshare", "cat", "/proc/self/uid_map"}) // Use podmanTest.PodmanBinary because podman-remote unshare cannot be used
unshare.WaitWithDefaultTimeout() cmd := exec.Command(podmanTest.PodmanBinary, "unshare", "cat", "/proc/self/uid_map")
Expect(unshare).Should(Exit(0)) session, err := Start(cmd, GinkgoWriter, GinkgoWriter)
initialUsernsConfig = unshare.Out.Contents() Expect(err).ToNot(HaveOccurred())
Eventually(session, DefaultWaitTimeout).Should(Exit(0))
initialUsernsConfig = session.Out.Contents()
} }
pod := getPod() pod := getPod()