diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-16 18:16:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 18:16:34 +0100 |
| commit | 197ebe8b5e6c10db786ad22692536e395c911b87 (patch) | |
| tree | a75c897b014fede28374b62d1bacc81957d3c70d /test | |
| parent | f031bd23c6f5f790dde383d542c940bfe2dfaadd (diff) | |
| parent | c8790bfbbb845450608adc7a0a03b77979165f42 (diff) | |
| download | podman-197ebe8b5e6c10db786ad22692536e395c911b87.tar.gz podman-197ebe8b5e6c10db786ad22692536e395c911b87.tar.bz2 podman-197ebe8b5e6c10db786ad22692536e395c911b87.zip | |
Merge pull request #12218 from vrothberg/pause-catatonit
infra container: replace pause with catatonit
Diffstat (limited to 'test')
| -rw-r--r-- | test/apiv2/40-pods.at | 4 | ||||
| -rw-r--r-- | test/e2e/pod_create_test.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/apiv2/40-pods.at b/test/apiv2/40-pods.at index f45e85f61..0a5201213 100644 --- a/test/apiv2/40-pods.at +++ b/test/apiv2/40-pods.at @@ -110,11 +110,11 @@ t GET libpod/pods/fakename/top 404 \ .cause="no such pod" t GET libpod/pods/foo/top 200 \ - .Processes[0][-1]="/pause" \ + .Processes[0][-1]="/catatonit -P" \ .Titles[-1]="COMMAND" t GET libpod/pods/foo/top?ps_args=args,pid 200 \ - .Processes[0][0]="/pause" \ + .Processes[0][0]="/catatonit -P" \ .Processes[0][1]="1" \ .Titles[0]="COMMAND" \ .Titles[1]="PID" \ diff --git a/test/e2e/pod_create_test.go b/test/e2e/pod_create_test.go index 12aeffd1b..f5a2caad7 100644 --- a/test/e2e/pod_create_test.go +++ b/test/e2e/pod_create_test.go @@ -369,13 +369,13 @@ var _ = Describe("Podman pod create", func() { check1 := podmanTest.Podman([]string{"container", "inspect", "--format", "{{.Config.Entrypoint}}", data.Containers[0].ID}) check1.WaitWithDefaultTimeout() Expect(check1).Should(Exit(0)) - Expect(check1.OutputToString()).To(Equal("/pause")) + Expect(check1.OutputToString()).To(Equal("/catatonit -P")) // check the Path and Args check2 := podmanTest.Podman([]string{"container", "inspect", "--format", "{{.Path}}:{{.Args}}", data.Containers[0].ID}) check2.WaitWithDefaultTimeout() Expect(check2).Should(Exit(0)) - Expect(check2.OutputToString()).To(Equal("/pause:[/pause]")) + Expect(check2.OutputToString()).To(Equal("/catatonit:[-P]")) }) It("podman create pod with --infra-command", func() { |