diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-09 18:40:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-09 18:40:36 -0500 |
| commit | 2d829aeb1fe0dc19c45e796141ab78ff192b5dbb (patch) | |
| tree | d1250fe1db1339b3f56eccf980aa74a4ec395ef2 /test/e2e/run_test.go | |
| parent | 8600c3b8e2436d73c7c13deb0da869b7f35069ea (diff) | |
| parent | 46385dd609efb3ab36d326f9e32b6e04f31d8867 (diff) | |
| download | podman-2d829aeb1fe0dc19c45e796141ab78ff192b5dbb.tar.gz podman-2d829aeb1fe0dc19c45e796141ab78ff192b5dbb.tar.bz2 podman-2d829aeb1fe0dc19c45e796141ab78ff192b5dbb.zip | |
Merge pull request #9284 from rhatdan/annotations
Support annotations from containers.conf
Diffstat (limited to 'test/e2e/run_test.go')
| -rw-r--r-- | test/e2e/run_test.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 76d362288..934b78202 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -332,6 +332,9 @@ var _ = Describe("Podman run", func() { It("podman run user capabilities test", func() { // We need to ignore the containers.conf on the test distribution for this test os.Setenv("CONTAINERS_CONF", "/dev/null") + if IsRemote() { + podmanTest.RestartRemoteService() + } session := podmanTest.Podman([]string{"run", "--rm", "--user", "bin", ALPINE, "grep", "CapBnd", "/proc/self/status"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) @@ -424,6 +427,9 @@ var _ = Describe("Podman run", func() { It("podman run user capabilities test with image", func() { // We need to ignore the containers.conf on the test distribution for this test os.Setenv("CONTAINERS_CONF", "/dev/null") + if IsRemote() { + podmanTest.RestartRemoteService() + } dockerfile := `FROM busybox USER bin` podmanTest.BuildImage(dockerfile, "test", "false") |