diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-17 15:42:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 15:42:30 +0200 |
| commit | 38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3 (patch) | |
| tree | 9f5cc3e43c361d15728580781e9bfd4a5a06372d /test/e2e | |
| parent | 4fb0f56063de13af53128be9da81027d988516be (diff) | |
| parent | eb8bfdad3e6e4f3bbb308c2ae8c8b6dbba7d4f1c (diff) | |
| download | podman-38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3.tar.gz podman-38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3.tar.bz2 podman-38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3.zip | |
Merge pull request #6622 from goochjj/podman_fix_init
Fix --init and --init-path
Diffstat (limited to 'test/e2e')
| -rw-r--r-- | test/e2e/run_test.go | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 76944b3db..6dce0b48d 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -151,12 +151,36 @@ var _ = Describe("Podman run", func() { session := podmanTest.Podman([]string{"run", "--init", ALPINE, "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) + result := podmanTest.Podman([]string{"inspect", "-l"}) + result.WaitWithDefaultTimeout() + Expect(result.ExitCode()).To(Equal(0)) + conData := result.InspectContainerToJSON() + Expect(conData[0].Path).To(Equal("/dev/init")) + Expect(conData[0].Config.Annotations["io.podman.annotations.init"]).To(Equal("TRUE")) }) It("podman run a container with --init and --init-path", func() { session := podmanTest.Podman([]string{"run", "--init", "--init-path", "/usr/libexec/podman/catatonit", ALPINE, "ls"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) + result := podmanTest.Podman([]string{"inspect", "-l"}) + result.WaitWithDefaultTimeout() + Expect(result.ExitCode()).To(Equal(0)) + conData := result.InspectContainerToJSON() + Expect(conData[0].Path).To(Equal("/dev/init")) + Expect(conData[0].Config.Annotations["io.podman.annotations.init"]).To(Equal("TRUE")) + }) + + It("podman run a container without --init", func() { + session := podmanTest.Podman([]string{"run", ALPINE, "ls"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + result := podmanTest.Podman([]string{"inspect", "-l"}) + result.WaitWithDefaultTimeout() + Expect(result.ExitCode()).To(Equal(0)) + conData := result.InspectContainerToJSON() + Expect(conData[0].Path).To(Equal("ls")) + Expect(conData[0].Config.Annotations["io.podman.annotations.init"]).To(Equal("FALSE")) }) It("podman run seccomp test", func() { |