diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-11 18:09:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-11 18:09:36 -0400 |
| commit | 72662f790bad0a3dc26a6a1498b6daa936702bb6 (patch) | |
| tree | 602f6d9d4264ac84e4365df9edfd87767b7175a7 /test | |
| parent | ec3037062d1f9a5ece00ffd465c0f815c06f1b5c (diff) | |
| parent | 4fbc5b8fe75b3d486a97c013af7a6b085292b46a (diff) | |
| download | podman-72662f790bad0a3dc26a6a1498b6daa936702bb6.tar.gz podman-72662f790bad0a3dc26a6a1498b6daa936702bb6.tar.bz2 podman-72662f790bad0a3dc26a6a1498b6daa936702bb6.zip | |
Merge pull request #11525 from rhatdan/healthcheck
Stop outputting 'healthy' on healthcheck
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/healthcheck_run_test.go | 9 | ||||
| -rw-r--r-- | test/e2e/play_kube_test.go | 2 | ||||
| -rw-r--r-- | test/system/220-healthcheck.bats | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go index 899c84a14..87f042ed9 100644 --- a/test/e2e/healthcheck_run_test.go +++ b/test/e2e/healthcheck_run_test.go @@ -5,6 +5,7 @@ import ( "os" "time" + define "github.com/containers/podman/v3/libpod/define" . "github.com/containers/podman/v3/test/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -157,7 +158,7 @@ var _ = Describe("Podman healthcheck run", func() { Expect(hc).Should(Exit(1)) inspect = podmanTest.InspectContainer("hc") - Expect(inspect[0].State.Healthcheck.Status).To(Equal("unhealthy")) + Expect(inspect[0].State.Healthcheck.Status).To(Equal(define.HealthCheckUnhealthy)) }) @@ -171,7 +172,7 @@ var _ = Describe("Podman healthcheck run", func() { Expect(hc).Should(Exit(0)) inspect := podmanTest.InspectContainer("hc") - Expect(inspect[0].State.Healthcheck.Status).To(Equal("healthy")) + Expect(inspect[0].State.Healthcheck.Status).To(Equal(define.HealthCheckHealthy)) }) It("podman healthcheck unhealthy but valid arguments check", func() { @@ -201,7 +202,7 @@ var _ = Describe("Podman healthcheck run", func() { Expect(hc).Should(Exit(1)) inspect = podmanTest.InspectContainer("hc") - Expect(inspect[0].State.Healthcheck.Status).To(Equal("unhealthy")) + Expect(inspect[0].State.Healthcheck.Status).To(Equal(define.HealthCheckUnhealthy)) foo := podmanTest.Podman([]string{"exec", "hc", "touch", "/foo"}) foo.WaitWithDefaultTimeout() @@ -212,6 +213,6 @@ var _ = Describe("Podman healthcheck run", func() { Expect(hc).Should(Exit(0)) inspect = podmanTest.InspectContainer("hc") - Expect(inspect[0].State.Healthcheck.Status).To(Equal("healthy")) + Expect(inspect[0].State.Healthcheck.Status).To(Equal(define.HealthCheckHealthy)) }) }) diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go index 15bd10616..fcda89fbc 100644 --- a/test/e2e/play_kube_test.go +++ b/test/e2e/play_kube_test.go @@ -1237,7 +1237,7 @@ var _ = Describe("Podman play kube", func() { hc := podmanTest.Podman([]string{"healthcheck", "run", "liveness-unhealthy-probe-pod-0-alpine"}) hc.WaitWithDefaultTimeout() hcoutput := hc.OutputToString() - Expect(hcoutput).To(ContainSubstring("unhealthy")) + Expect(hcoutput).To(ContainSubstring(define.HealthCheckUnhealthy)) }) It("podman play kube fail with nonexistent authfile", func() { diff --git a/test/system/220-healthcheck.bats b/test/system/220-healthcheck.bats index f929c6770..e416629e6 100644 --- a/test/system/220-healthcheck.bats +++ b/test/system/220-healthcheck.bats @@ -74,7 +74,7 @@ EOF # # So, just force a healthcheck run, then confirm that it's running. run_podman healthcheck run healthcheck_c - is "$output" "healthy" "output from 'podman healthcheck run'" + is "$output" "" "output from 'podman healthcheck run'" _check_health "All healthy" " Status | healthy |