diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-30 11:13:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 11:13:19 -0400 |
| commit | 0a839a59ec43ae03c522a1b82224605219256ab1 (patch) | |
| tree | d88cc6fb228c89301a837d1b4501aed34d1cb69b /test | |
| parent | 05f083461047d0b5425e22334e8259038a51492e (diff) | |
| parent | e7b7fcbd8a8bfc71ce4d038fe50fee59ac26ca45 (diff) | |
| download | podman-0a839a59ec43ae03c522a1b82224605219256ab1.tar.gz podman-0a839a59ec43ae03c522a1b82224605219256ab1.tar.bz2 podman-0a839a59ec43ae03c522a1b82224605219256ab1.zip | |
Merge pull request #13694 from giuseppe/v4.0-backport-no-inheritable
[4.0] do not set the inheritable capabilities
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/run_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 91a2eddad..81dcc4342 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -498,7 +498,7 @@ var _ = Describe("Podman run", func() { session = podmanTest.Podman([]string{"run", "--rm", "--user", "root", ALPINE, "grep", "CapInh", "/proc/self/status"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(session.OutputToString()).To(ContainSubstring("00000000a80425fb")) + Expect(session.OutputToString()).To(ContainSubstring("0000000000000000")) session = podmanTest.Podman([]string{"run", "--rm", ALPINE, "grep", "CapBnd", "/proc/self/status"}) session.WaitWithDefaultTimeout() @@ -533,7 +533,7 @@ var _ = Describe("Podman run", func() { session = podmanTest.Podman([]string{"run", "--user=0:0", "--cap-add=DAC_OVERRIDE", "--rm", ALPINE, "grep", "CapInh", "/proc/self/status"}) session.WaitWithDefaultTimeout() Expect(session).Should(Exit(0)) - Expect(session.OutputToString()).To(ContainSubstring("00000000a80425fb")) + Expect(session.OutputToString()).To(ContainSubstring("0000000000000000")) if os.Geteuid() > 0 { if os.Getenv("SKIP_USERNS") != "" { |